" + picture(paper, 3163.5, 1948.5, true) + "
";
if (const auto art = notebook_art(); !art.token.empty()) out += "
" + picture(art, 3163.5, 1948.5, true) + "
";
- out += "
" + svg(stain ? "nb-lines" : "nb-lines-plain", 1406, 866, lines, 2800) + "
" +
+ out += "
" + svg((stain ? "nb-lines-" : "nb-lines-clean-") + sheet, 1406, 866, lines, 2800) + "
" +
svg("nb-corner", 62, 62, "
", 200) + "";
diff --git a/src/modern/ui/settings_screens.inc b/src/modern/ui/settings_screens.inc
index c7645e9..510fe4f 100644
--- a/src/modern/ui/settings_screens.inc
+++ b/src/modern/ui/settings_screens.inc
@@ -274,6 +274,9 @@ std::string App::render_settings() {
settings_row("preference-motion", "Übergänge und Einblendungen", "Reduziert: Fenster, Karten und Tor-Einblendungen erscheinen ohne Bewegung.",
settings_select("preference-motion", {{"full", "Voll"}, {"reduced", "Reduziert"}},
p.at("display").at("motion").get
(), "global", "display", "motion")) +
+ settings_row("preference-paper", "Papier des Notizbuchs", "Linien, Kästchen oder ein leeres Blatt.",
+ settings_select("preference-paper", {{"ruled", "Liniert"}, {"squared", "Kariert"}, {"plain", "Blanko"}},
+ p.at("display").at("paper").get(), "global", "display", "paper")) +
(page && engine_mode_ ? "" : " ");
if (engine_mode_) {
int width=0,height=0; SDL_GetWindowSize(video_.window,&width,&height);
diff --git a/src/modern/ui/ui_preferences.cpp b/src/modern/ui/ui_preferences.cpp
index b23d698..55aa73b 100644
--- a/src/modern/ui/ui_preferences.cpp
+++ b/src/modern/ui/ui_preferences.cpp
@@ -27,7 +27,8 @@ Json default_ui_preferences() {
{"resolution", "1920x1080"},
{"scale", "auto"},
{"language", "de"},
- {"motion", "full"}}},
+ {"motion", "full"},
+ {"paper", "ruled"}}},
{"sound", {{"volume", 80}, {"effects", true}, {"style", "classic"}}}};
}
bool valid_ui_preferences(const Json &v) {
@@ -36,8 +37,9 @@ bool valid_ui_preferences(const Json &v) {
!choice(v.at("theme"), {"midnight", "silver", "matchday"}))
return false;
const auto &d = v.at("display"), &s = v.at("sound");
- return keys(d, {"mode", "resolution", "scale", "language", "motion"}) &&
+ return keys(d, {"mode", "resolution", "scale", "language", "motion", "paper"}) &&
choice(d.at("motion"), {"full", "reduced"}) &&
+ choice(d.at("paper"), {"ruled", "squared", "plain"}) &&
keys(s, {"volume", "effects", "style"}) &&
choice(d.at("mode"), {"window", "fullscreen"}) &&
choice(d.at("resolution"), {"1280x720", "1600x900", "1920x1080",
@@ -76,6 +78,11 @@ Json load_ui_preferences(const fs::path &path) {
envelope["preferences"].contains("display") && envelope["preferences"]["display"].is_object() &&
!envelope["preferences"]["display"].contains("motion"))
envelope["preferences"]["display"]["motion"] = "full";
+ // and one written before the notebook's paper could be chosen keeps its ruled lines
+ if (envelope.is_object() && envelope.contains("preferences") && envelope["preferences"].is_object() &&
+ envelope["preferences"].contains("display") && envelope["preferences"]["display"].is_object() &&
+ !envelope["preferences"]["display"].contains("paper"))
+ envelope["preferences"]["display"]["paper"] = "ruled";
if (!keys(envelope, {"schema", "preferences"}) ||
envelope.at("schema") != "openbmh-ui-preferences@1" ||
!valid_ui_preferences(envelope.at("preferences")))