chore: sync upstream (no squash)

Author: xLPMG

.github/workflows/ci.yml

@@ -275,8 +275,42 @@ jobs:
         # When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
         copyback: false
         prepare: |
-          pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5-charts qt5-concurrent qt5-core qt5-gui qt5-network qt5-opengl \
-                         qt5-widgets qt5-multimedia qt5-webengine qt5-buildtools qt5-qmake qt5-script qt5-testlib qt5-linguisttools
+          pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5
+
+        run: |
+          set -e -x
+          export DISPLAY=:0
+          mkdir builds
+          cd builds
+          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On "${{ github.workspace }}"
+          make -j3
+          Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
+          sleep 3
+          ctest --output-on-failure
+          sleep 1
+          pkill Xvfb
+
+  # CI on FreeBSD (Qt6)
+  ci-freebsd-qt6:
+    name: "FreeBSD (x86_64; qt6)"
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.actor, 'transifex')"
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Build and run unit tests in FreeBSD
+      uses: vmactions/freebsd-vm@v1
+      id: freebsd-qt6
+      with:
+        release: "14.2"
+        # Use sh shell
+        usesh: true
+        # When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
+        copyback: false
+        prepare: |
+          pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6
 
         run: |
           set -e -x

BUILDING.md

@@ -91,7 +91,7 @@ To install all of these, use the following commands:
 
 ```
 sudo apt install build-essential cmake zlib1g-dev libgl1-mesa-dev libdrm-dev gcc g++ \
-                 graphviz doxygen gettext git libgps-dev \
+                 graphviz doxygen gettext git libgps-dev libqt5qxlsx-dev \
                  gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-pulseaudio \
                  gstreamer1.0-libav gstreamer1.0-vaapi qtbase5-dev \
                  qtbase5-private-dev qtscript5-dev libqt5svg5-dev qttools5-dev-tools \

CMakeLists.txt

@@ -134,6 +134,7 @@ MESSAGE(STATUS "Platform: ${CMAKE_SYSTEM} (${CMAKE_SYSTEM_PROCESSOR})")
 SET(ENABLE_TESTING 0 CACHE BOOL "Define whether the unit tests should be activated.")
 SET(ENABLE_LTO 0 CACHE BOOL "Define whether the Link Time Optimization should be activated.")
 SET(ENABLE_PCH 1 CACHE BOOL "Define whether to use precompiled headers.")
+SET(ENABLE_CCACHE 1 CACHE BOOL "Define whether to use ccache if possible.")
 
 IF(NOT CMAKE_BUILD_TYPE)
      SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind ASan UBSan Release RelWithDebInfo MinSizeRel." FORCE)
@@ -197,7 +198,7 @@ IF(OPENGL_DEBUG_LOGGING)
 ENDIF()
 
 # Use ccache if possible
-IF(NOT WIN32)
+IF(NOT WIN32 AND ENABLE_CCACHE)
      FIND_PROGRAM(CCACHE_PROGRAM ccache)
      IF(CCACHE_PROGRAM)
           MESSAGE(STATUS "Found ccache ${CCACHE_PROGRAM}")

data/gui/normalStyle.css

@@ -55,6 +55,7 @@ QSizeGrip {
 QTextEdit,
 QPlainTextEdit,
 QListWidget,
+QTreeWidget,
 QLineEdit {
 	border: 1px solid rgb(0, 0, 0);
 	border-radius: 0;
@@ -67,6 +68,7 @@ QLineEdit {
 
 QTextEdit:disabled,
 QListWidget:disabled,
+QTreeWidget:disabled,
 QLineEdit:disabled {
 	background: rgb(90, 90, 90);
 }
@@ -424,69 +426,79 @@ QGroupBox::indicator {
  * indicators, but there's a problem with spacing discussed at
  * https://stackoverflow.com/q/77422984 */
 QListWidget::indicator,
+QTreeWidget::indicator,
 QListView::indicator {
 	margin: 0;
 	background: none;
 }
 
 QCheckBox::indicator:checked,
 QListWidget::indicator:checked,
+QTreeWidget::indicator:checked,
 QListView::indicator:checked,
 QGroupBox::indicator:checked {
 	image: url(:/graphicGui/uieCheckbox-checked.png);
 }
 
 QCheckBox::indicator:indeterminate,
 QListWidget::indicator:indeterminate,
+QTreeWidget::indicator:indeterminate,
 QListView::indicator:indeterminate,
 QGroupBox::indicator:indeterminate {
 	image: url(:/graphicGui/uieCheckbox-partial.png);
 }
 
 QCheckBox::indicator:unchecked,
 QListWidget::indicator:unchecked,
+QTreeWidget::indicator:unchecked,
 QListView::indicator:unchecked,
 QGroupBox::indicator:unchecked {
 	image: url(:/graphicGui/uieCheckbox-unchecked.png);
 }
 
 QCheckBox::indicator:hover:checked,
 QListWidget::indicator:hover:checked,
+QTreeWidget::indicator:hover:checked,
 QListView::indicator:hover:checked,
 QGroupBox::indicator:hover:checked {
 	image: url(:/graphicGui/uieCheckbox-checked-hover.png);
 }
 
 QCheckBox::indicator:hover:indeterminate,
 QListWidget::indicator:hover:indeterminate,
+QTreeWidget::indicator:hover:indeterminate,
 QListView::indicator:hover:indeterminate,
 QGroupBox::indicator:hover:indeterminate {
 	image: url(:/graphicGui/uieCheckbox-partial-hover.png);
 }
 
 QCheckBox::indicator:hover:unchecked,
 QListWidget::indicator:hover:unchecked,
+QTreeWidget::indicator:hover:unchecked,
 QListView::indicator:hover:unchecked,
 QGroupBox::indicator:hover:unchecked {
 	image: url(:/graphicGui/uieCheckbox-unchecked-hover.png);
 }
 
 QCheckBox::indicator:checked:disabled,
 QListWidget::indicator:checked:disabled,
+QTreeWidget::indicator:checked:disabled,
 QListView::indicator:checked:disabled,
 QGroupBox::indicator:checked:disabled {
 	image: url(:/graphicGui/uieCheckbox-checked-disabled.png);
 }
 
 QCheckBox::indicator:indeterminate:disabled,
 QListWidget::indicator:indeterminate:disabled,
+QTreeWidget::indicator:indeterminate:disabled,
 QListView::indicator:indeterminate:disabled,
 QGroupBox::indicator:indeterminate:disabled {
 	image: url(:/graphicGui/uieCheckbox-partial-disabled.png);
 }
 
 QCheckBox::indicator:unchecked:disabled,
 QListWidget::indicator:unchecked:disabled,
+QTreeWidget::indicator:unchecked:disabled,
 QListView::indicator:unchecked:disabled,
 QGroupBox::indicator:unchecked:disabled {
 	image: url(:/graphicGui/uieCheckbox-unchecked-disabled.png);

guide/app_config_ini.tex

@@ -391,7 +391,8 @@ \subsection{\big[devel\big]}
 convert\_dso\_catalog        & bool & Set to \emph{true} to convert file \file{catalog.txt} 
                                       into file \file{catalog.dat}. Default value: \emph{false}.\\%\midrule
 convert\_dso\_decimal\_coord & bool & Set to \emph{true} to use decimal values for coordinates 
-                                      in source catalog. Default value: \emph{true}.\\\bottomrule
+                                      in source catalog. Default value: \emph{true}.\\\midrule
+markers\_to\_logfile         & bool & Write marker coordinates to logfile. Useful when developing dark constellations. See p.~\pageref{SC:constellations:dark:markers}\\\bottomrule
 \end{tabularx}
 
 \subsection{\big[dso\_catalog\_filters\big]}

guide/ch_skycultures.tex

@@ -525,7 +525,7 @@ \subsection{Constellations}
 \end{description}
 
 
-\paragraph{Drawing dark constellations}\index{constellations!dark}
+\paragraph{Drawing dark constellations}\index{constellations!dark}\label{SC:constellations:dark:markers}
 The outlines \newFeature{25.2}of figures like the ``Emu in the Sky'' cannot be described with connect-the-dot star patterns, 
 as they are formed from the absence of luminous patterns. We need to describe them using coordinate lists. 
 To make the process less tedious, we can extend setting Markers (see \ref{sec:tour:markers}). 
@@ -547,6 +547,14 @@ \subsection{Constellations}
 While the IAU has defined 88 constellation areas in 1930, constellations of other cultures are not as clearly defined. These areas can help analyzing historical records.
 Note that a point may lie in zero, one or more than one constellation area(s) when it overlaps two or even more adjacent figures. 
 
+Technically, the stars are projected perspectively onto a tangential plane to the celestial sphere 
+at the balance point of all involved stars. 
+Then a simple \emph{package wrapping} algorithm \citep[ch.25]{Sedgewick:AlgorithmsInC} can be applied to find the convex hull. 
+Straight lines in the projection are great circle arcs. 
+Note that this limits constellation size to less than 180 degrees in the sky, 
+outlying stars will currently be discarded. 
+(Please report an error if this affects you, so we might find a better solution.)
+
 This functionality is an advanced topic mostly used by sky culture researchers \citep[e.g.][94-98]{Hoffmann2017a} who are also not afraid of calling scripting functions (see ch.~\ref{ch:scripting}), 
 and is therefore hidden from beginning users. To make use of it, edit your \file{config.ini} and add a key:
 \begin{configfile}

guide/guide.bib

@@ -2237,3 +2237,12 @@ @book{Hoffmann2017a
     doi = {10.1007/978-3-658-18683-8}
 }
 
+@book{Sedgewick:AlgorithmsInC,
+    author = {{Sedgewick}, Robert},
+    publisher = {Addison-Wesley Publishing Company},
+    title = {{Algorithms in C}},
+    year = {1990},
+    address = {Reading, MA/Menlo Park, CA/New York et al.},
+    OPTisbn = {},
+    series = {Computer Science},
+}

po/stellarium-remotecontrol/ca.po

@@ -8,17 +8,17 @@
 # Gemma Domènech <info@gemmadomenech.com>, 2022
 # Pascual Martínez Reig <pascualmralcoi@gmail.com>, 2022
 # Susanna Pujol, 2022
-# Daniel Alomar <daniel.adastra@gmail.com>, 2025
 # cardinot <mcardinot@gmail.com>, 2025
+# Daniel Alomar <daniel.adastra@gmail.com>, 2025
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: stellarium-remotecontrol\n"
 "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n"
-"POT-Creation-Date: 2025-06-02 10:04+0700\n"
+"POT-Creation-Date: 2025-07-14 13:19+0700\n"
 "PO-Revision-Date: 2022-10-05 14:25+0000\n"
-"Last-Translator: cardinot <mcardinot@gmail.com>, 2025\n"
+"Last-Translator: Daniel Alomar <daniel.adastra@gmail.com>, 2025\n"
 "Language-Team: Catalan (https://app.transifex.com/stellarium/teams/80998/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -112,8 +112,8 @@ msgid "Could not retrieve landscape list"
 msgstr "No puc recuperar la llista de paisatges"
 
 #: plugins/RemoteControl/webroot/js/plugins/scenery3d.js:22
-#: plugins/RemoteControl/webroot/js/ui/scripts.js:76 index.html:750
-#: index.html:812 tablet7in.html:835 tablet7in.html:895
+#: plugins/RemoteControl/webroot/js/ui/scripts.js:76 index.html:761
+#: index.html:823 tablet7in.html:845 tablet7in.html:905
 msgid "-none-"
 msgstr "-cap-"
 
@@ -547,83 +547,95 @@ msgstr "Mostra l'art en la brillantor"
 msgid "Show boundaries with thickness"
 msgstr "Mostrar contorns amb gruix"
 
-#: index.html:732 tablet7in.html:805
-msgid "Use native names for planets"
-msgstr "Feu servir noms nadius per als planetes"
+#: index.html:733 tablet7in.html:805
+msgid "Show zodiac with thickness"
+msgstr "Mostrar el zodíac amb gruix"
+
+#: index.html:737 tablet7in.html:809
+msgid "Show lunar stations/mansions with thickness"
+msgstr "Mostra les estacions/mansions lunars amb gruix"
 
-#: index.html:733 tablet7in.html:806
+#: index.html:741 tablet7in.html:813
+msgid "Short labels"
+msgstr "Etiquetes curtes"
+
+#: index.html:742 tablet7in.html:814
 msgid "Constellation selection isolated"
 msgstr "Selecció de constel·lació aïllada"
 
-#: index.html:737 tablet7in.html:810
+#: index.html:743 tablet7in.html:815
+msgid "Only last selected"
+msgstr "Només l’última selecció"
+
+#: index.html:748 tablet7in.html:820
 msgid "Current sky culture"
 msgstr "Cultura del cel actual"
 
-#: index.html:750 tablet7in.html:835
+#: index.html:761 tablet7in.html:845
 msgid "Active script:"
 msgstr "Script actiu:"
 
-#: index.html:751 tablet7in.html:836
+#: index.html:762 tablet7in.html:846
 msgid "Run selected script"
 msgstr "Executar script seleccionat"
 
-#: index.html:751 tablet7in.html:836
+#: index.html:762 tablet7in.html:846
 msgid "Stop current script"
 msgstr "Aturar script actual"
 
-#: index.html:756 tablet7in.html:43 tablet7in.html:820
+#: index.html:767 tablet7in.html:43 tablet7in.html:830
 msgid "Actions"
 msgstr "Accions"
 
-#: index.html:760 tablet7in.html:824
+#: index.html:771 tablet7in.html:834
 msgid "Run/toggle action"
 msgstr "Executar/commutar acció"
 
-#: index.html:771 tablet7in.html:859
+#: index.html:782 tablet7in.html:869
 msgid "Planet map"
 msgstr "Mapa de planeta"
 
-#: index.html:772 tablet7in.html:860
+#: index.html:783 tablet7in.html:870
 msgid "Planet map pointer"
 msgstr "Punter del mapa del planeta"
 
-#: index.html:776 tablet7in.html:864
+#: index.html:787 tablet7in.html:874
 msgid "Type to search location"
 msgstr "Escrigui per cercar ubicació"
 
-#: index.html:810 tablet7in.html:893
+#: index.html:821 tablet7in.html:903
 msgid "Interaction"
 msgstr "Interacció"
 
-#: index.html:811 tablet7in.html:894
+#: index.html:822 tablet7in.html:904
 msgid "Current scene:"
 msgstr "Escena actual:"
 
-#: index.html:814 tablet7in.html:897
+#: index.html:825 tablet7in.html:907
 msgid "View controls"
 msgstr "Controls de vista"
 
-#: index.html:820 tablet7in.html:903
+#: index.html:831 tablet7in.html:913
 msgid "Movement controls"
 msgstr "Controls de moviment"
 
-#: index.html:832 tablet7in.html:915
+#: index.html:843 tablet7in.html:925
 msgid "Torchlight"
 msgstr "Llum de torxa"
 
-#: index.html:839 tablet7in.html:922
+#: index.html:850 tablet7in.html:932
 msgid "Scene selection"
 msgstr "Selecció d'escena"
 
-#: index.html:843 tablet7in.html:926
+#: index.html:854 tablet7in.html:936
 msgid "Load selected scene"
 msgstr "Carregar escena seleccionada"
 
-#: index.html:869 tablet7in.html:953
+#: index.html:880 tablet7in.html:963
 msgid "No response from server"
 msgstr "Ńo hi ha resposta del sevidor"
 
-#: index.html:870 tablet7in.html:954
+#: index.html:881 tablet7in.html:964
 msgid "No response from server for %1 seconds. Is Stellarium still running?"
 msgstr ""
 "No hi ha resposta del servidor des de fa %1 segons. Està Stellarium encara "
@@ -769,18 +781,18 @@ msgstr "Aquari"
 msgid "Pisces"
 msgstr "Peixos"
 
-#: tablet7in.html:844
+#: tablet7in.html:854
 msgid "Favorites"
 msgstr "Favorits"
 
-#: tablet7in.html:846
+#: tablet7in.html:856
 msgid "Show 1"
 msgstr "Mostrar 1"
 
-#: tablet7in.html:847
+#: tablet7in.html:857
 msgid "Remove Labels and Images"
 msgstr "Eliminar Etiquetes i Imatges"
 
-#: tablet7in.html:847
+#: tablet7in.html:857
 msgid "Cleanup Screen"
 msgstr "Neteja Pantalla"