Skip to content

Commit 3dfa570

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 2abc052 + 26d92d6 commit 3dfa570

25 files changed

Lines changed: 99308 additions & 98896 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,13 +289,15 @@ jobs:
289289
uses: vmactions/freebsd-vm@v1
290290
id: freebsd-qt5
291291
with:
292-
release: "14.2"
292+
release: "14.3"
293293
# Use sh shell
294294
usesh: true
295295
# When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
296296
copyback: false
297297
prepare: |
298-
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5
298+
pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx perl5 xorg-vfbserver gettext qt5-charts qt5-concurrent qt5-core \
299+
qt5-gui qt5-network qt5-opengl qt5-widgets qt5-multimedia qt5-webengine qt5-buildtools qt5-qmake qt5-script qt5-testlib \
300+
qt5-linguisttools
299301
300302
run: |
301303
set -e -x
@@ -305,7 +307,7 @@ jobs:
305307
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
306308
-DSTELLARIUM_RELEASE_BUILD=Off \
307309
-DENABLE_TESTING=On \
308-
"${{ github.workspace }}"
310+
-DENABLE_QT6=Off "${{ github.workspace }}"
309311
make -j3
310312
Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
311313
sleep 3
@@ -327,7 +329,7 @@ jobs:
327329
uses: vmactions/freebsd-vm@v1
328330
id: freebsd-qt6
329331
with:
330-
release: "14.2"
332+
release: "14.3"
331333
# Use sh shell
332334
usesh: true
333335
# 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)