Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,8 @@ set(DUSK_FILES
src/dusk/ui/graphics_tuner.hpp
src/dusk/ui/input.cpp
src/dusk/ui/input.hpp
src/dusk/ui/i18n.cpp
src/dusk/ui/i18n.hpp
src/dusk/ui/modal.cpp
src/dusk/ui/modal.hpp
src/dusk/ui/nav_types.hpp
Expand Down
2 changes: 2 additions & 0 deletions include/dusk/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ struct UserSettings {
ConfigVar<bool> enableAchievementToasts;
ConfigVar<bool> enableControllerToasts;
ConfigVar<bool> enableDiscordPresence;
ConfigVar<bool> enableChineseNameKeyboard;

// Graphics
ConfigVar<BloomMode> bloomMode;
Expand Down Expand Up @@ -219,6 +220,7 @@ struct UserSettings {
struct {
ConfigVar<std::string> isoPath;
ConfigVar<DiscVerificationState> isoVerification;
ConfigVar<std::string> uiLanguage;
ConfigVar<std::string> graphicsBackend;
ConfigVar<bool> skipPreLaunchUI;
ConfigVar<bool> showPipelineCompilation;
Expand Down
Binary file added res/HarmonyOS_Sans_Regular.ttf
Binary file not shown.
Binary file added res/HarmonyOS_Sans_SC_Regular.ttf
Binary file not shown.
Binary file added res/HarmonyOS_Sans_TC_Regular.ttf
Binary file not shown.
488 changes: 488 additions & 0 deletions res/i18n/en.xml

Large diffs are not rendered by default.

486 changes: 486 additions & 0 deletions res/i18n/fr.xml

Large diffs are not rendered by default.

486 changes: 486 additions & 0 deletions res/i18n/ja.xml

Large diffs are not rendered by default.

488 changes: 488 additions & 0 deletions res/i18n/zh-cn.xml

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions res/rml/overlay.rcss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ body {
pointer-events: none;
}

.lang-zh-cn body,
.lang-zh-cn body toast,
.lang-zh-cn body toast heading,
.lang-zh-cn body toast message,
.lang-zh-cn body fps {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}

fps,
toast {
position: absolute;
Expand Down Expand Up @@ -324,3 +332,10 @@ logo img.outer {
top: 20dp;
}
}

/* Keep CJK font override at end so it wins over per-widget font-family rules. */
.lang-zh-cn body toast heading,
.lang-zh-cn body speedrun-timer,
.lang-zh-cn body fps {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}
19 changes: 19 additions & 0 deletions res/rml/prelaunch.rcss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ body {
z-index: -1;
}

.lang-zh-cn body,
.lang-zh-cn body menu,
.lang-zh-cn body menu button,
.lang-zh-cn body disc-info,
.lang-zh-cn body version-info {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}

.gradient {
position: absolute;
width: 100%;
Expand Down Expand Up @@ -494,3 +502,14 @@ body.animate-in .intro-item {
justify-content: flex-start;
}
}

/* Keep CJK font override at end so it wins over per-widget font-family rules. */
.lang-zh-cn body eyebrow,
.lang-zh-cn body #menu-list button,
.lang-zh-cn body disc-info,
.lang-zh-cn body version-info,
.lang-zh-cn body #disc-version,
.lang-zh-cn body .update,
.lang-zh-cn body .detail {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}
16 changes: 14 additions & 2 deletions res/rml/window.rcss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ body {
color: #E0DBC8;
}

b {
font-weight: bold;
.lang-zh-cn body,
.lang-zh-cn body window tab-bar,
.lang-zh-cn body window content pane,
.lang-zh-cn body window content pane:last-of-type > div {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}

window {
Expand Down Expand Up @@ -519,3 +522,12 @@ progress.verification-progress-bar {
flex: 0 0 auto;
padding-top: 4dp;
}

/* Keep CJK font override at end so it wins over per-widget font-family rules. */
.lang-zh-cn body .section-heading,
.lang-zh-cn body window tab-bar,
.lang-zh-cn body select-button key,
.lang-zh-cn body .modal-title,
.lang-zh-cn body .achievement-total {
font-family: "HarmonyOS Sans SC", "HarmonyOS Sans TC", "Microsoft YaHei", "Microsoft JhengHei", "Yu Gothic UI", "Malgun Gothic", "Noto Sans CJK SC", "Noto Sans CJK TC", "Noto Sans CJK JP", "Noto Sans CJK KR", "Noto Sans SC", "Noto Sans TC", "Noto Sans JP", "Noto Sans KR", "SimHei", sans-serif;
}
Loading
Loading