Skip to content

Commit 47d843e

Browse files
raphaelscholleraphaelscholle
committed
languages
1 parent be40f06 commit 47d843e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+9536
-2550
lines changed

‎QOpenHD.pro‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,10 @@ HEADERS += \
195195
app/osd/aoagauge.h \
196196

197197

198-
RESOURCES += qml/qml.qrc
198+
RESOURCES += qml/qml.qrc \
199+
qml/qml_assets_fonts.qrc \
200+
qml/qml_assets_images.qrc \
201+
qml/qml_assets_cursors.qrc
199202

200203

201204
DISTFILES += \

‎app/main.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <QQmlComponent>
66
#include <QDebug>
77
#include <QFontDatabase>
8+
#include <QFont>
89
#include <QElapsedTimer>
910
#include <QHash>
1011
#include <QMutex>
@@ -159,6 +160,16 @@ static void load_fonts(){
159160
QFontDatabase::addApplicationFont(":/osdfonts/ZolanMonoOblique.ttf");
160161
}
161162

163+
static void setup_font_substitutions(){
164+
#if defined(__windows__)
165+
const QString mono_fallback = "Roboto Mono";
166+
QFont::insertSubstitution("Fixedsys", mono_fallback);
167+
QFont::insertSubstitution("8514oem", mono_fallback);
168+
QFont::insertSubstitution("Terminal", mono_fallback);
169+
QFont::insertSubstitution("monospace", mono_fallback);
170+
#endif
171+
}
172+
162173
#if defined(__linux__) && !defined(__android__)
163174
namespace {
164175
std::atomic<bool> g_log_warnings_only{true};
@@ -425,6 +436,7 @@ int main(int argc, char *argv[]) {
425436
QOpenHD::instance().keep_screen_on(true);
426437
android_check_permissions();
427438
load_fonts();
439+
setup_font_substitutions();
428440

429441
qmlRegisterType<SpeedLadder>("OpenHD", 1, 0, "SpeedLadder");
430442
qmlRegisterType<AltitudeLadder>("OpenHD", 1, 0, "AltitudeLadder");

‎qml/qml.qrc‎

Lines changed: 3 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<RCC>
2-
<qresource prefix="/translations">
2+
<qresource prefix="/translations">
33
<file>QOpenHD_en.qm</file>
44
<file>QOpenHD_de.qm</file>
55
<file>QOpenHD_uk.qm</file>
@@ -10,12 +10,8 @@
1010
<file>QOpenHD_ro.qm</file>
1111
<file>QOpenHD_it.qm</file>
1212
<file>QOpenHD_zh.qm</file>
13-
<file>resources/cursors/arrow_512_green.png</file>
14-
<file>resources/cursors/arrow_512_transparent.png</file>
15-
<file>resources/cursors/arrow_512_white.png</file>
16-
<file>resources/cursors/hand_white.png</file>
17-
</qresource>
18-
<qresource prefix="/">
13+
</qresource>
14+
<qresource prefix="/">
1915
<file>main.qml</file>
2016
<file>qtquickcontrols2.conf</file>
2117
<file>ui/widgets/MessageHUD.qml</file>
@@ -61,61 +57,8 @@
6157
<file>ui/widgets/RollWidget.qml</file>
6258
<file>ui/elements/LanguageSelect.qml</file>
6359
<file>ui/elements/LanguageSelectForm.ui.qml</file>
64-
<file alias="round.png">../icons/round.png</file>
6560
<file>ui/elements/Card.qml</file>
6661
<file>ui/widgets/SpeedSecondWidget.qml</file>
67-
<file>osdfonts/Acme-Regular.ttf</file>
68-
<file>osdfonts/Aldrich-Regular.ttf</file>
69-
<file>osdfonts/AnonymousPro-Bold.ttf</file>
70-
<file>osdfonts/AnonymousPro-BoldItalic.ttf</file>
71-
<file>osdfonts/Archivo-Bold.ttf</file>
72-
<file>osdfonts/Archivo-Medium.ttf</file>
73-
<file>osdfonts/Archivo-Regular.ttf</file>
74-
<file>osdfonts/ArchivoBlack-Regular.ttf</file>
75-
<file>osdfonts/Armata-Regular.ttf</file>
76-
<file>osdfonts/Bangers-Regular.ttf</file>
77-
<file>osdfonts/BlackOpsOne-Regular.ttf</file>
78-
<file>osdfonts/Bungee-Regular.ttf</file>
79-
<file>osdfonts/Carbon-Bold.ttf</file>
80-
<file>osdfonts/Chicle-Regular.ttf</file>
81-
<file>osdfonts/Digital7SegmentDisplay.ttf</file>
82-
<file>osdfonts/DigitalDotDisplay.ttf</file>
83-
<file>osdfonts/DigitalSubwayTicker.ttf</file>
84-
<file>osdfonts/ExpletusSans-Bold.ttf</file>
85-
<file>osdfonts/FjallaOne-Regular.ttf</file>
86-
<file>osdfonts/FredokaOne-Regular.ttf</file>
87-
<file>osdfonts/GeostarFill-Regular.ttf</file>
88-
<file>osdfonts/Iceberg-Regular.ttf</file>
89-
<file>osdfonts/Iceland-Regular.ttf</file>
90-
<file>osdfonts/Jura-Bold.ttf</file>
91-
<file>osdfonts/KeaniaOne-Regular.ttf</file>
92-
<file>osdfonts/Larabie.ttf</file>
93-
<file>osdfonts/LuckiestGuy-Regular.ttf</file>
94-
<file>osdfonts/Merysha-Regular.ttf</file>
95-
<file>osdfonts/NixieOne-Regular.ttf</file>
96-
<file>osdfonts/Orbitron-Bold.ttf</file>
97-
<file>osdfonts/Orbitron-Regular.ttf</file>
98-
<file>osdfonts/Oxygen-Bold.ttf</file>
99-
<file>osdfonts/Oxygen-Regular.ttf</file>
100-
<file>osdfonts/PassionOne-Bold.ttf</file>
101-
<file>osdfonts/Quantico-Bold.ttf</file>
102-
<file>osdfonts/Quantico-Regular.ttf</file>
103-
<file>osdfonts/Quicksand-Bold.ttf</file>
104-
<file>osdfonts/Quicksand-Regular.ttf</file>
105-
<file>osdfonts/RammettoOne-Regular.ttf</file>
106-
<file>osdfonts/Rationale-Regular.ttf</file>
107-
<file>osdfonts/Righteous-Regular.ttf</file>
108-
<file>osdfonts/RobotoMono-Bold.ttf</file>
109-
<file>osdfonts/RobotoMono-Medium.ttf</file>
110-
<file>osdfonts/RussoOne-Regular.ttf</file>
111-
<file>osdfonts/ShareTech-Regular.ttf</file>
112-
<file>osdfonts/ShareTechMono-Regular.ttf</file>
113-
<file>osdfonts/SigmarOne-Regular.ttf</file>
114-
<file>osdfonts/Slackey-Regular.ttf</file>
115-
<file>osdfonts/UbuntuMono-Bold.ttf</file>
116-
<file>osdfonts/UbuntuMono-BoldItalic.ttf</file>
117-
<file>osdfonts/Visitor.ttf</file>
118-
<file>osdfonts/ZolanMonoOblique.ttf</file>
11962
<file>ui/elements/FontSelect.qml</file>
12063
<file>ui/elements/OSDCustomizer.qml</file>
12164
<file>ui/elements/colorwheel/CheckerBoard.qml</file>
@@ -134,39 +77,12 @@
13477
<file>ui/widgets/FlightMahKmWidget.qml</file>
13578
<file>ui/widgets/MissionWidget.qml</file>
13679
<file>ui/widgets/RetransmissionStarsWidget.qml</file>
137-
<file>resources/osdicons.ttf</file>
138-
<file>resources/materialdesignicons-webfont.ttf</file>
139-
<file>resources/ic128.png</file>
140-
<file>resources/ic.png</file>
141-
<file>resources/homemarker.png</file>
142-
<file>resources/Font Awesome 5 Free-Solid-900.otf</file>
14380
<file>ui/widgets/QRenderStatsWidget.qml</file>
14481
<file>ui/widgets/map/MapComponent.qml</file>
14582
<file>ui/configpopup/ConfigPopup.qml</file>
146-
<file>resources/master1.png</file>
147-
<file>resources/master2.png</file>
148-
<file>resources/master3.png</file>
149-
<file>resources/master4.png</file>
150-
<file>resources/master5.png</file>
151-
<file>resources/noconnection.svg</file>
15283
<file>ui/widgets/AirspeedTempWidget.qml</file>
15384
<file>ui/widgets/AoaWidget.qml</file>
15485
<file>ui/widgets/MessageHUDRow.qml</file>
155-
<file>resources/cameras/ArduIMX462.png</file>
156-
<file>resources/cameras/ArduIMX477.png</file>
157-
<file>resources/cameras/ArduIMX519.png</file>
158-
<file>resources/cameras/otherHDMI.png</file>
159-
<file>resources/cameras/otherIP.png</file>
160-
<file>resources/cameras/otherTest.png</file>
161-
<file>resources/cameras/raspHq.png</file>
162-
<file>resources/cameras/raspOther.png</file>
163-
<file>resources/cameras/raspV1.png</file>
164-
<file>resources/cameras/raspV2.png</file>
165-
<file>resources/cameras/veyeIMX290.png</file>
166-
<file>resources/cameras/veyeIMX327.png</file>
167-
<file>resources/cameras/veyeIMX462.png</file>
168-
<file>resources/cameras/veyeIMX307.png</file>
169-
<file>resources/cameras/veyeSC132.png</file>
17086
<file>video/MainVideoGStreamer.qml</file>
17187
<file>video/SecondaryVideoGStreamer.qml</file>
17288
<file>video/SecondaryVideoAndroid.qml</file>
@@ -178,10 +94,6 @@
17894
<file>ui/elements/SettingBaseElement.qml</file>
17995
<file>ui/widgets/WBLinkRateControlWidget.qml</file>
18096
<file>ui/widgets/BaseWidgetDefaultUiControlElements.qml</file>
181-
<file>resources/cursors/arrow_512_transparent.png</file>
182-
<file>resources/cursors/arrow_512_green.png</file>
183-
<file>resources/cursors/arrow_512_white.png</file>
184-
<file>resources/cursors/hand_white.png</file>
18597
<file>ui/widgets/VideoBitrateWidgetPrimary.qml</file>
18698
<file>ui/widgets/DistanceSensorWidget.qml</file>
18799
<file>ui/widgets/UAVTimeWiget.qml</file>
@@ -292,9 +204,6 @@
292204
<file>ui/sidebar/Panel8FindAirUnit.qml</file>
293205
<file>ui/sidebar/SidebarStackButton.qml</file>
294206
<file>ui/sidebar/RCChannelView.qml</file>
295-
<file>ui/widgets/map/ADSBcautionMarker.png</file>
296-
<file>ui/widgets/map/ADSBmarker.png</file>
297-
<file>ui/widgets/map/ADSBwarnMarker.png</file>
298207
<file>ui/elements/NewSwitch.qml</file>
299208
<file>ui/elements/NewSpinBox.qml</file>
300209
<file>ui/elements/NewSlider.qml</file>

‎qml/qml_assets_cursors.qrc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>resources/cursors/arrow_512_transparent.png</file>
4+
<file>resources/cursors/arrow_512_green.png</file>
5+
<file>resources/cursors/arrow_512_white.png</file>
6+
<file>resources/cursors/hand_white.png</file>
7+
</qresource>
8+
</RCC>

‎qml/qml_assets_fonts.qrc‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file>osdfonts/Acme-Regular.ttf</file>
4+
<file>osdfonts/Aldrich-Regular.ttf</file>
5+
<file>osdfonts/AnonymousPro-Bold.ttf</file>
6+
<file>osdfonts/AnonymousPro-BoldItalic.ttf</file>
7+
<file>osdfonts/Archivo-Bold.ttf</file>
8+
<file>osdfonts/Archivo-Medium.ttf</file>
9+
<file>osdfonts/Archivo-Regular.ttf</file>
10+
<file>osdfonts/ArchivoBlack-Regular.ttf</file>
11+
<file>osdfonts/Armata-Regular.ttf</file>
12+
<file>osdfonts/Bangers-Regular.ttf</file>
13+
<file>osdfonts/BlackOpsOne-Regular.ttf</file>
14+
<file>osdfonts/Bungee-Regular.ttf</file>
15+
<file>osdfonts/Carbon-Bold.ttf</file>
16+
<file>osdfonts/Chicle-Regular.ttf</file>
17+
<file>osdfonts/Digital7SegmentDisplay.ttf</file>
18+
<file>osdfonts/DigitalDotDisplay.ttf</file>
19+
<file>osdfonts/DigitalSubwayTicker.ttf</file>
20+
<file>osdfonts/ExpletusSans-Bold.ttf</file>
21+
<file>osdfonts/FjallaOne-Regular.ttf</file>
22+
<file>osdfonts/FredokaOne-Regular.ttf</file>
23+
<file>osdfonts/GeostarFill-Regular.ttf</file>
24+
<file>osdfonts/Iceberg-Regular.ttf</file>
25+
<file>osdfonts/Iceland-Regular.ttf</file>
26+
<file>osdfonts/Jura-Bold.ttf</file>
27+
<file>osdfonts/KeaniaOne-Regular.ttf</file>
28+
<file>osdfonts/Larabie.ttf</file>
29+
<file>osdfonts/LuckiestGuy-Regular.ttf</file>
30+
<file>osdfonts/Merysha-Regular.ttf</file>
31+
<file>osdfonts/NixieOne-Regular.ttf</file>
32+
<file>osdfonts/Orbitron-Bold.ttf</file>
33+
<file>osdfonts/Orbitron-Regular.ttf</file>
34+
<file>osdfonts/Oxygen-Bold.ttf</file>
35+
<file>osdfonts/Oxygen-Regular.ttf</file>
36+
<file>osdfonts/PassionOne-Bold.ttf</file>
37+
<file>osdfonts/Quantico-Bold.ttf</file>
38+
<file>osdfonts/Quantico-Regular.ttf</file>
39+
<file>osdfonts/Quicksand-Bold.ttf</file>
40+
<file>osdfonts/Quicksand-Regular.ttf</file>
41+
<file>osdfonts/RammettoOne-Regular.ttf</file>
42+
<file>osdfonts/Rationale-Regular.ttf</file>
43+
<file>osdfonts/Righteous-Regular.ttf</file>
44+
<file>osdfonts/RobotoMono-Bold.ttf</file>
45+
<file>osdfonts/RobotoMono-Medium.ttf</file>
46+
<file>osdfonts/RussoOne-Regular.ttf</file>
47+
<file>osdfonts/ShareTech-Regular.ttf</file>
48+
<file>osdfonts/ShareTechMono-Regular.ttf</file>
49+
<file>osdfonts/SigmarOne-Regular.ttf</file>
50+
<file>osdfonts/Slackey-Regular.ttf</file>
51+
<file>osdfonts/UbuntuMono-Bold.ttf</file>
52+
<file>osdfonts/UbuntuMono-BoldItalic.ttf</file>
53+
<file>osdfonts/Visitor.ttf</file>
54+
<file>osdfonts/ZolanMonoOblique.ttf</file>
55+
<file>resources/osdicons.ttf</file>
56+
<file>resources/materialdesignicons-webfont.ttf</file>
57+
<file>resources/Font Awesome 5 Free-Solid-900.otf</file>
58+
</qresource>
59+
</RCC>

‎qml/qml_assets_images.qrc‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<RCC>
2+
<qresource prefix="/">
3+
<file alias="round.png">../icons/round.png</file>
4+
<file>resources/ic128.png</file>
5+
<file>resources/ic.png</file>
6+
<file>resources/homemarker.png</file>
7+
<file>resources/rapha.png</file>
8+
<file>resources/max.png</file>
9+
<file>resources/thomas.png</file>
10+
<file>resources/pete.png</file>
11+
<file>resources/luka.png</file>
12+
<file>resources/noconnection.svg</file>
13+
<file>resources/cameras/ArduIMX462.png</file>
14+
<file>resources/cameras/ArduIMX477.png</file>
15+
<file>resources/cameras/ArduIMX519.png</file>
16+
<file>resources/cameras/otherHDMI.png</file>
17+
<file>resources/cameras/otherIP.png</file>
18+
<file>resources/cameras/otherTest.png</file>
19+
<file>resources/cameras/raspHq.png</file>
20+
<file>resources/cameras/raspOther.png</file>
21+
<file>resources/cameras/raspV1.png</file>
22+
<file>resources/cameras/raspV2.png</file>
23+
<file>resources/cameras/veyeIMX290.png</file>
24+
<file>resources/cameras/veyeIMX327.png</file>
25+
<file>resources/cameras/veyeIMX462.png</file>
26+
<file>resources/cameras/veyeIMX307.png</file>
27+
<file>resources/cameras/veyeSC132.png</file>
28+
<file>ui/widgets/map/ADSBcautionMarker.png</file>
29+
<file>ui/widgets/map/ADSBmarker.png</file>
30+
<file>ui/widgets/map/ADSBwarnMarker.png</file>
31+
</qresource>
32+
</RCC>

‎qml/resources/luka.png‎

880 KB
Loading

‎qml/resources/max.png‎

987 KB
Loading

‎qml/resources/pete.png‎

1.22 MB
Loading

‎qml/resources/rapha.png‎

1.17 MB
Loading

0 commit comments

Comments
 (0)