Skip to content

Commit ae7dfc1

Browse files
committed
Merge branch 'master' into rework-snapping-and-dark-constellations
2 parents 90fb9de + 4bed379 commit ae7dfc1

25 files changed

Lines changed: 99313 additions & 98898 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ jobs:
173173
cmake -DCMAKE_PREFIX_PATH="/usr/local" \
174174
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
175175
-DSTELLARIUM_RELEASE_BUILD=Off \
176-
-DENABLE_TESTING=On ${{ github.workspace }}
176+
-DENABLE_TESTING=On \
177+
"${{ github.workspace }}"
177178
178179
- name: Compile
179180
working-directory: build
@@ -216,7 +217,8 @@ jobs:
216217
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
217218
-DSTELLARIUM_RELEASE_BUILD=Off \
218219
-DSCM_SHOULD_ENABLE_CONVERTER=On \
219-
-DENABLE_TESTING=On ${{ github.workspace }}
220+
-DENABLE_TESTING=On \
221+
"${{ github.workspace }}"
220222
221223
- name: Compile
222224
working-directory: build
@@ -263,7 +265,7 @@ jobs:
263265
-DSTELLARIUM_RELEASE_BUILD=Off \
264266
-DENABLE_TESTING=On \
265267
-DSCM_SHOULD_ENABLE_CONVERTER=On \
266-
${{ github.workspace }}
268+
"${{ github.workspace }}"
267269
268270
- name: Compile
269271
working-directory: build
@@ -289,13 +291,15 @@ jobs:
289291
uses: vmactions/freebsd-vm@v1
290292
id: freebsd-qt5
291293
with:
292-
release: "14.2"
294+
release: "14.3"
293295
# Use sh shell
294296
usesh: true
295297
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
296298
copyback: false
297299
prepare: |
298-
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5
300+
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5-charts qt5-concurrent qt5-core \
301+
qt5-gui qt5-network qt5-opengl qt5-widgets qt5-multimedia qt5-webengine qt5-buildtools qt5-qmake qt5-script qt5-testlib \
302+
qt5-linguisttools
299303
300304
run: |
301305
set -e -x
@@ -305,6 +309,7 @@ jobs:
305309
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
306310
-DSTELLARIUM_RELEASE_BUILD=Off \
307311
-DENABLE_TESTING=On \
312+
-DENABLE_QT6=Off \
308313
"${{ github.workspace }}"
309314
make -j3
310315
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
@@ -327,7 +332,7 @@ jobs:
327332
uses: vmactions/freebsd-vm@v1
328333
id: freebsd-qt6
329334
with:
330-
release: "14.2"
335+
release: "14.3"
331336
# Use sh shell
332337
usesh: true
333338
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.

data/gui/normalStyle.css

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,21 @@ QPlainTextEdit,
5757
QListWidget,
5858
QTreeWidget,
5959
QLineEdit {
60-
border: 1px solid rgb(0, 0, 0);
61-
border-radius: 0;
62-
padding: 0 8px;
6360
background: rgb(30, 30, 31);
6461
selection-background-color: rgb(253, 216, 134);
6562
color: rgb(170, 173, 164);
6663
font-size: 100%;
6764
}
6865

66+
QTextEdit,
67+
QPlainTextEdit,
68+
QListWidget,
69+
QLineEdit {
70+
border: 1px solid rgb(0, 0, 0);
71+
border-radius: 0;
72+
padding: 0 8px;
73+
}
74+
6975
QTextEdit:disabled,
7076
QListWidget:disabled,
7177
QTreeWidget:disabled,

data/nomenclature.dat

171 Bytes
Binary file not shown.

data/nomenclature.fab

Lines changed: 87 additions & 77 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)