Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kebekus
kebekus committed Mar 14, 2024
2 parents 5cf276f + 46a2314 commit cdd1ead
Show file tree
Hide file tree
Showing 135 changed files with 5,204 additions and 964 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: jurplel/install-qt-action@v3
with:
cache: 'true'
modules: 'qt5compat qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtshadertools qtspeech qtwebsockets'
modules: 'qt5compat qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtshadertools qtspeech qtwebsockets qtwebview'
version: '6.6.*'
- name: Install LinuxDeploy
uses: miurahr/install-linuxdeploy-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: jurplel/install-qt-action@v3
with:
version: '6.6.*'
modules: 'qt5compat qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtshadertools qtspeech qtwebsockets'
modules: 'qt5compat qthttpserver qtimageformats qtlocation qtmultimedia qtpositioning qtshadertools qtspeech qtwebsockets qtwebview'
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/enrouteManual
Submodule enrouteManual updated 69 files
+0 −4 .gitignore
+9 −0 .vscode/ltex.dictionary.en-US.txt
+3 −0 .vscode/settings.json
+ − 01-gettingStarted/autogenerated/01-03-01-ground.png
+ − 01-gettingStarted/autogenerated/01-03-02-flight.png
+ − 01-gettingStarted/autogenerated/01-03-03-EDFEinfo.png
+ − 01-gettingStarted/autogenerated/01-03-04-Aircraft.png
+4 −3 02-tutorialBasic/01-traffic.rst
+3 −5 02-tutorialBasic/05-plan.rst
+ − 02-tutorialBasic/autogenerated/02-01-01-traffic.png
+ − 02-tutorialBasic/autogenerated/02-02-01-Nearby.png
+ − 02-tutorialBasic/autogenerated/02-02-01-RouteEmpty.png
+ − 02-tutorialBasic/autogenerated/02-02-02-RouteNonEmpty.png
+ − 02-tutorialBasic/autogenerated/02-02-03-AddWP.png
+ − 02-tutorialBasic/autogenerated/02-02-04-EnRoute.png
+ − 02-tutorialBasic/autogenerated/02-03-01-Weather.png
+ − 02-tutorialBasic/autogenerated/02-03-02-WeatherDialog.png
+ − 03-tutorialAdvanced/autogenerated/03-03-VAC.png
+12 −0 04-additionalSoftware.rst
+97 −0 04-additionalSoftware/01-flightPlanning.rst
+153 −0 04-additionalSoftware/02-mapping.rst
+3 −3 05-referencePages.rst
+0 −0 05-referencePages/01-mainPage.rst
+8 −0 05-referencePages/02-settings.rst
+0 −0 05-referencePages/03-about.rst
+ − 05-referencePages/AD-GLD.png
+ − 05-referencePages/AD-GRASS.png
+ − 05-referencePages/AD-INOP.png
+ − 05-referencePages/AD-MIL-GRASS.png
+ − 05-referencePages/AD-MIL-PAVED.png
+ − 05-referencePages/AD-MIL.png
+ − 05-referencePages/AD-PAVED.png
+ − 05-referencePages/AD-UL.png
+ − 05-referencePages/AD-WATER.png
+ − 05-referencePages/AD.png
+ − 05-referencePages/DVOR-DME.png
+ − 05-referencePages/DVOR.png
+ − 05-referencePages/DVORTAC.png
+ − 05-referencePages/MRP.png
+ − 05-referencePages/NDB.png
+ − 05-referencePages/NOTAM.png
+ − 05-referencePages/RP.png
+ − 05-referencePages/VOR-DME.png
+ − 05-referencePages/VOR.png
+ − 05-referencePages/VORTAC.png
+ − 05-referencePages/WP.png
+ − 05-referencePages/self-noDirection.png
+ − 05-referencePages/self-noPosition.png
+ − 05-referencePages/self-withDirection.png
+ − 05-referencePages/traffic-noDirection-green.png
+ − 05-referencePages/traffic-noDirection-red.png
+ − 05-referencePages/traffic-noDirection-yellow.png
+ − 05-referencePages/traffic-withDirection-green.png
+ − 05-referencePages/traffic-withDirection-red.png
+ − 05-referencePages/traffic-withDirection-yellow.png
+1 −1 06-referenceWorkflow.rst
+30 −8 06-referenceWorkflow/01-share.rst
+0 −7 07-appendix.rst
+0 −333 07-appendix/03-privacy.rst
+2 −2 07-referenceTechnology.rst
+0 −0 07-referenceTechnology/01-trafficData.rst
+0 −0 07-referenceTechnology/02-platformNotes.rst
+7 −0 08-appendix.rst
+0 −0 08-appendix/01-dataSources.rst
+0 −0 08-appendix/02-license.rst
+509 −0 08-appendix/03-privacy.rst
+0 −0 08-appendix/04-authors.rst
+0 −0 08-appendix/licenses_overview.rst
+5 −4 index.rst
2 changes: 1 addition & 1 deletion 3rdParty/enrouteText
Submodule enrouteText updated 5 files
+224 −110 assets/enroute_de.ts
+206 −108 assets/enroute_es.ts
+207 −109 assets/enroute_fr.ts
+207 −109 assets/enroute_it.ts
+223 −109 assets/enroute_pl.ts
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ option(BUILD_DOC "Build developer documentation" OFF)
# Project data
#

project(enroute VERSION 2.30.8)
project(enroute VERSION 2.30.9)
set(APP_ID de.akaflieg_freiburg.enroute)
set(DISPLAY_NAME "Enroute")
math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH})
Expand All @@ -40,7 +40,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)

find_package(Qt6 6.6.2 COMPONENTS Concurrent Core Core5Compat Gui HttpServer LinguistTools Location Positioning Quick QuickControls2 QuickWidgets Sql Svg TextToSpeech Widgets REQUIRED)
find_package(Qt6 6.6.2 COMPONENTS Concurrent Core Core5Compat Gui HttpServer LinguistTools Location Positioning Quick QuickControls2 QuickWidgets Sql Svg TextToSpeech WebView Widgets REQUIRED)
qt_policy(SET QTP0002 NEW)


Expand All @@ -55,7 +55,7 @@ find_package(QMapLibre COMPONENTS Location REQUIRED)


if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(Qt6 COMPONENTS DBus Widgets REQUIRED)
find_package(Qt6 COMPONENTS DBus WebView Widgets REQUIRED)
endif()

if( ANDROID OR IOS)
Expand Down
68 changes: 34 additions & 34 deletions generatedSources/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ add_custom_target(waypointIcons4manual

COMMAND rsvg-convert ${CMAKE_SOURCE_DIR}/src/icons/waypoints/ic_warning_18px.svg -o NOTAM.png -w 30
COMMAND rsvg-convert ${CMAKE_SOURCE_DIR}/src/icons/waypoints/WP-map.svg -o WP.png -w 10
COMMAND mv *.png ${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/04-referencePages
COMMAND mv *.png ${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/05-referencePages
COMMENT "Generated sources: waypoint images for manual"
)

Expand Down Expand Up @@ -211,44 +211,44 @@ add_custom_target(screenshots4Manual
#

add_custom_target(manualText
COMMAND echo "Privacy Policies" >${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "================" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "English" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "-------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=EN ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Privacy Policies" >${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "================" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "English" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "-------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=EN ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Deutsche Übersetzung" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "--------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=DE ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Deutsche Übersetzung" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "--------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=DE ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Traduction en français" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "----------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=FR ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Traduction en français" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "----------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=FR ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Traduzione italiana" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "-------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=IT ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Traduzione italiana" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "-------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=IT ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Polskie tłumaczenie" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "-------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=PL ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Polskie tłumaczenie" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "-------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=PL ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Traducción al español" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "---------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=ES ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/07-appendix/03-privacy.rst
COMMAND echo "Traducción al español" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "---------------------" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND QT_QPA_PLATFORM=xcb LC_ALL=ES ${CMAKE_BINARY_DIR}/src/enroute --string :text/privacy.html | pandoc --from=HTML --write=rst >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
COMMAND echo "" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteManual/08-appendix/03-privacy.rst
#
COMMAND echo "Authors" >${CMAKE_SOURCE_DIR}/3rdParty/enrouteText/manual/04-appendix/authors.rst
COMMAND echo "=======" >>${CMAKE_SOURCE_DIR}/3rdParty/enrouteText/manual/04-appendix/authors.rst
Expand Down
2 changes: 1 addition & 1 deletion generatedSources/generateAttributions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def get_name(employee):
htmlString += "<li>{}. {}.</li>\n".format(entry["Name"], entry["License"])


with open("3rdParty/enrouteManual/07-appendix/licenses_overview.rst", "w") as rstFile:
with open("3rdParty/enrouteManual/08-appendix/licenses_overview.rst", "w") as rstFile:
rstFile.write(rstString)
rstFile.close()

Expand Down
Binary file modified generatedSources/manual/.doctrees/02-tutorialBasic/01-traffic.doctree
View file
Binary file not shown.
Binary file modified generatedSources/manual/.doctrees/02-tutorialBasic/05-plan.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/04-additionalSoftware.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/04-additionalSoftware/01-flightPlanning.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/04-additionalSoftware/02-mapping.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/05-referencePages.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/05-referencePages/01-mainPage.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/05-referencePages/02-settings.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/05-referencePages/03-about.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/06-referenceWorkflow.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/06-referenceWorkflow/01-share.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/07-referenceTechnology.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/07-referenceTechnology/01-trafficData.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/07-referenceTechnology/02-platformNotes.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix/01-dataSources.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix/02-license.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix/03-privacy.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix/04-authors.doctree
View file
Binary file not shown.
Binary file added generatedSources/manual/.doctrees/08-appendix/licenses_overview.doctree
View file
Binary file not shown.
Binary file modified generatedSources/manual/.doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified generatedSources/manual/.doctrees/index.doctree
View file
Binary file not shown.
15 changes: 8 additions & 7 deletions generatedSources/manual/01-gettingStarted.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,20 @@
<ul>
<li class="toctree-l1"><a class="reference internal" href="02-tutorialBasic.html">Basic Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="03-tutorialAdvanced.html">Advanced Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="04-additionalSoftware.html">Additional software</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Reference Manual</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="04-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="05-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="06-referenceTechnology.html">Technology</a></li>
<li class="toctree-l1"><a class="reference internal" href="05-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="06-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="07-referenceTechnology.html">Technology</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="07-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="07-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="07-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="07-appendix/04-authors.html">Authors</a></li>
<li class="toctree-l1"><a class="reference internal" href="08-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="08-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="08-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="08-appendix/04-authors.html">Authors</a></li>
</ul>

</div>
Expand Down
15 changes: 8 additions & 7 deletions generatedSources/manual/01-gettingStarted/01-think.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,20 @@
<ul>
<li class="toctree-l1"><a class="reference internal" href="../02-tutorialBasic.html">Basic Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="../03-tutorialAdvanced.html">Advanced Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="../04-additionalSoftware.html">Additional software</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Reference Manual</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../04-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="../05-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="../06-referenceTechnology.html">Technology</a></li>
<li class="toctree-l1"><a class="reference internal" href="../05-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="../06-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-referenceTechnology.html">Technology</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/04-authors.html">Authors</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/04-authors.html">Authors</a></li>
</ul>

</div>
Expand Down
15 changes: 8 additions & 7 deletions generatedSources/manual/01-gettingStarted/02-installation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,20 @@
<ul>
<li class="toctree-l1"><a class="reference internal" href="../02-tutorialBasic.html">Basic Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="../03-tutorialAdvanced.html">Advanced Use</a></li>
<li class="toctree-l1"><a class="reference internal" href="../04-additionalSoftware.html">Additional software</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Reference Manual</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../04-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="../05-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="../06-referenceTechnology.html">Technology</a></li>
<li class="toctree-l1"><a class="reference internal" href="../05-referencePages.html">User Interface: Pages</a></li>
<li class="toctree-l1"><a class="reference internal" href="../06-referenceWorkflow.html">User Interface: Workflows</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-referenceTechnology.html">Technology</a></li>
</ul>
<p class="caption" role="heading"><span class="caption-text">Appendix</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="../07-appendix/04-authors.html">Authors</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/01-dataSources.html">Data Sources</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/02-license.html">Software and Data Licenses</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/03-privacy.html">Privacy Policies</a></li>
<li class="toctree-l1"><a class="reference internal" href="../08-appendix/04-authors.html">Authors</a></li>
</ul>

</div>
Expand Down
Loading

0 comments on commit cdd1ead

Please sign in to comment.