Port settings and automation to the Modern UI (by Codex)

This commit is contained in:
Codex committed 2026-10-25 21:36:18 +01:00
1 parent 8222926d9c
commit adb4166a80
26 files changed
+2734 -179

No files matched your search

+2 -2
View File
@@ -52,9 +52,9 @@ jobs:
- name: Configure opt-in UI without external assets
run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA=
- name: Compile native frontend and synthetic checks
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests --parallel 2
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests --parallel 2
- name: Check controls, fonts, density and draft cancellation
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_)" --output-on-failure --output-junit modern-ui-results.xml
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_)" --output-on-failure --output-junit modern-ui-results.xml
- name: Upload test report
if: always()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+2
View File
@@ -0,0 +1,2 @@
<!-- SPDX-License-Identifier: GPL-3.0-only -->
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#dceae7" stroke-width="1.8" stroke-linecap="round"><circle cx="10" cy="10" r="6.5"/><path d="m15 15 5 5"/></svg>

After

Width:  |  Height:  |  Size: 240 B

+1 -1
View File
@@ -1,6 +1,6 @@
<rml>
<head><title>OpenBMH</title><link type="text/rcss" href="theme.rcss"/><link type="text/rcss" href="ticket.rcss"/><link type="text/rcss" href="sports.rcss"/><link type="text/rcss" href="calendar.rcss"/><link type="text/rcss" href="reports.rcss"/><link type="text/rcss" href="report_details.rcss"/><link type="text/rcss" href="report_pickers.rcss"/><link type="text/rcss" href="indoor.rcss"/><link type="text/rcss" href="planning.rcss"/><link type="text/rcss" href="almanac.rcss"/><link type="text/rcss" href="finance.rcss"/>
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/><link type="text/rcss" href="stadium.rcss"/><link type="text/rcss" href="statistics.rcss"/><link type="text/rcss" href="news.rcss"/></head>
<link type="text/rcss" href="bank.rcss"/><link type="text/rcss" href="contracts.rcss"/><link type="text/rcss" href="amount.rcss"/><link type="text/rcss" href="environment.rcss"/><link type="text/rcss" href="advertising.rcss"/><link type="text/rcss" href="toto.rcss"/><link type="text/rcss" href="lineup.rcss"/><link type="text/rcss" href="transfer.rcss"/><link type="text/rcss" href="career_reports.rcss"/><link type="text/rcss" href="rankings.rcss"/><link type="text/rcss" href="stadium.rcss"/><link type="text/rcss" href="statistics.rcss"/><link type="text/rcss" href="news.rcss"/><link type="text/rcss" href="settings.rcss"/></head>
<body class="midnight">
<div id="background"></div>
<div id="canvas"></div>
+79
View File
@@ -0,0 +1,79 @@
/* SPDX-License-Identifier: GPL-3.0-only */
body {--settings-focus:#9dc4dd;--settings-tab:#9cafc240;--settings-selection:#79aa9d12;--settings-apply:#79aa9d40;--settings-accent-border:#a7dfd038;--settings-divider:#c5d9e714;--settings-toggle:#65a29a;--settings-knob:#c8d6e0;--settings-input:#263744;}
body.silver {--settings-focus:#2b729a;--settings-tab:#a3c3dd54;--settings-selection:#a3c3dd54;--settings-apply:#a3c3dd54;--settings-accent-border:#356f966e;--settings-divider:#6c879c28;--settings-toggle:#25617a;--settings-knob:#ffffff;--settings-input:#ffffffad;}
body.matchday {--settings-focus:#efb2aa;--settings-tab:#d48c7b26;--settings-selection:#d48c7b26;--settings-apply:#d48c7b26;--settings-accent-border:#e5a19770;--settings-divider:#ead9da16;--settings-toggle:#efb2aa;--settings-knob:#f8ece6;--settings-input:#191a208a;}
.settings-layout {position:absolute;left:0;right:0;top:0;bottom:150dp;}
.settings-categories {position:absolute;left:0;top:0;bottom:0;width:370dp;padding:24dp 20dp;border:2dp var(--border);border-radius:18dp;background-color:var(--panel);}
.settings-categories button {display:flex;align-items:center;justify-content:flex-start;width:100%;height:100dp;margin-bottom:14dp;padding:20dp 28dp;text-align:left;font-size:34dp;}
.settings-categories button.active {background-color:var(--settings-tab);border-color:var(--settings-accent-border);color:var(--text);}
.settings-categories button>span {display:block;flex-shrink:0;}
.settings-pane {position:absolute;left:410dp;right:0;top:0;bottom:0;padding:32dp 36dp;border:2dp var(--border);border-radius:18dp;background-color:var(--panel);}
.settings-pane-header {display:flex;align-items:flex-start;justify-content:space-between;gap:25dp;}
.settings-pane-header h2 {margin:0;font-size:42dp;line-height:1.2;font-weight:normal;}
.settings-pane-header p {margin-top:16dp;font-size:28dp;color:var(--muted);}
.settings-scroll {position:absolute;left:36dp;right:26dp;top:164dp;bottom:26dp;padding:0 0 20dp 0;overflow-y:auto;overflow-x:hidden;}
.settings-pane[data-category=game] .settings-scroll {top:276dp;}
.settings-scroll:focus-visible {border:3dp var(--accent);border-radius:10dp;}
.settings-group {margin:0 0 44dp;}
.settings-group h3 {margin:0;padding:12dp 0 24dp;border-bottom:2dp var(--settings-divider);font-size:32dp;font-weight:normal;line-height:1.2;color:var(--text);}
.settings-group-help {margin:20dp 0 4dp;font-size:26dp;line-height:1.5;color:var(--muted);}
.settings-row {display:flex;align-items:center;justify-content:space-between;gap:32dp;min-height:132dp;padding:24dp 4dp;border-bottom:2dp var(--settings-divider);}
.settings-row>label {display:block;flex:1;min-width:0;}
.settings-row label>span {display:block;font-size:31dp;line-height:1.35;}
.settings-row label>small {display:block;margin-top:10dp;font-size:25dp;line-height:1.5;color:var(--muted);}
.settings-select,.settings-number {flex-shrink:0;width:480dp;min-height:72dp;padding:12dp 20dp;border:2dp var(--border);border-radius:12dp;background-color:var(--settings-input);font-size:30dp;color:var(--text);}
.settings-select selectbox {font-size:30dp;}
.settings-select:disabled {opacity:0.4;}
.settings-number {width:180dp;text-align:right;}
.settings-switch {position:relative;flex-shrink:0;width:88dp;height:48dp;min-width:88dp;min-height:48dp;margin:0;padding:0;border:2dp var(--border);border-radius:24dp;background-color:#53687866;}
.settings-switch.checked {background-color:var(--settings-toggle);border-color:var(--settings-accent-border);}
.settings-switch.mixed {background-color:var(--selected);}
.settings-switch-knob {position:absolute;top:5dp;width:34dp;height:34dp;border-radius:17dp;background-color:var(--settings-knob);box-shadow:0dp 2dp 6dp #0005;}
.settings-switch.checked .settings-switch-knob {background-color:var(--settings-knob);}
.settings-automation-master {margin-bottom:28dp;padding:0 24dp;border:2dp var(--settings-accent-border);border-radius:16dp;background-color:var(--settings-selection);}
.settings-automation-master .settings-row {border:0dp;}
.settings-automation-master label>span {font-weight:bold;}
.settings-volume {width:590dp;display:flex;align-items:center;gap:28dp;}
.settings-volume input {width:420dp;min-width:0;}
.settings-volume>span {display:block;flex-shrink:0;min-width:110dp;text-align:right;font-size:31dp;color:var(--accent);}
.settings-jump-label {display:flex;flex-direction:column;align-items:flex-end;gap:12dp;color:var(--muted);font-size:24dp;}
.settings-jump-label .settings-select {width:560dp;font-size:27dp;}
.settings-jump-label .settings-select selectbox {font-size:27dp;}
.settings-competition {margin-top:30dp;}
.settings-competition h4 {margin:0;padding:18dp 20dp;border-radius:10dp;background-color:var(--soft);font-size:30dp;font-weight:normal;}
.settings-competition .settings-row {padding-left:20dp;}
.settings-actions {position:absolute;left:0;right:0;bottom:0;height:100dp;display:flex;align-items:center;gap:24dp;}
.settings-actions p {flex:1;min-width:0;margin:0;font-size:28dp;color:var(--text);}
.settings-actions button {min-width:270dp;width:270dp;height:94dp;flex-shrink:0;font-size:32dp;}
#settings-apply {background-color:var(--settings-apply);border-color:var(--settings-accent-border);color:var(--text);}
#settings-apply:disabled {opacity:0.35;}
.settings-searchbar {position:absolute;top:158dp;left:36dp;right:36dp;height:80dp;display:flex;align-items:center;gap:24dp;}
.settings-search-field {min-width:0;flex:1;display:flex;align-items:center;gap:18dp;height:80dp;padding:8dp 12dp 8dp 22dp;border:2dp var(--border);border-radius:14dp;background-color:var(--input);}
.settings-search-field>.image-frame {flex-shrink:0;}
#settings-search {flex:1;min-width:0;width:100%;padding:8dp 0;border:0dp;border-radius:0dp;background-color:transparent;font-size:30dp;}
#settings-search-clear {width:52dp;height:52dp;min-width:52dp;padding:0;border:0dp;background-color:transparent;font-size:38dp;}
#settings-search-clear:disabled {opacity:0.25;}
#settings-search-count {display:block;flex-shrink:0;width:250dp;margin:0;text-align:right;font-size:25dp;}
.settings-search-empty {padding:100dp 24dp;text-align:center;font-size:34dp;line-height:1.5;}
.settings-search-empty small {display:block;margin-top:14dp;font-size:27dp;color:var(--muted);}
.settings-theme-options {display:flex;gap:28dp;margin-top:28dp;align-items:stretch;}
.settings-theme-choice {display:block;flex:1;min-width:0;padding:18dp;border:2dp var(--border);border-radius:20dp;background-color:var(--soft);text-align:left;}
.settings-theme-choice[aria-pressed=true] {border-color:var(--settings-focus);background-color:var(--settings-selection);}
.settings-theme-choice>strong {display:block;margin-top:18dp;font-size:31dp;font-weight:bold;}
.settings-theme-choice>small {display:block;margin-top:18dp;font-size:24dp;line-height:1.4;color:var(--muted);}
.settings-theme-preview {position:relative;width:100%;height:404.583dp;border:1dp #c5d5e033;border-radius:12dp;overflow:hidden;background-color:#243e56;}
.preview-background {position:absolute;left:0;right:0;top:0;bottom:0;opacity:0.35;}
.preview-bar {position:absolute;left:0;right:0;top:0;height:32dp;background-color:#263744f2;border-bottom:1dp #a6c7d755;}
.preview-bar>span {position:absolute;left:12dp;top:10dp;width:12dp;height:12dp;border-radius:6dp;background-color:#a6c7d755;}
.preview-widget {position:absolute;top:62dp;height:84dp;border:1dp #a6c7d755;border-radius:12dp;background-color:#29465ab8;}
.preview-widget.one {left:18dp;width:58%;}
.preview-widget.two {left:64%;right:18dp;}
.preview-app {position:absolute;top:164dp;width:45dp;height:45dp;border-radius:12dp;decorator:linear-gradient(145deg,#7da4aa,#376784);}
.preview-app.app-one {left:12%;}.preview-app.app-two {left:41%;}.preview-app.app-three {left:72%;}
.preview-window {position:absolute;left:30%;right:10%;top:56dp;bottom:24dp;padding:38dp 16dp 12dp;border:1dp #a6c7d755;border-radius:10dp;decorator:linear-gradient(155deg,#303c49eb,#1a2531f2);box-shadow:0dp 8dp 20dp #0005;}
.preview-title {position:absolute;left:0;right:0;top:0;height:26dp;border-bottom:1dp #a6c7d755;}
.preview-title>span {position:absolute;left:10dp;top:9dp;width:8dp;height:8dp;border-radius:4dp;background-color:#fa6a60;}
.preview-line {position:relative;display:block;width:100%;height:62dp;margin-bottom:8dp;border-radius:3dp;background-color:#a6c7d755;opacity:0.45;}
.preview-silver {background-color:#c6d9e9;}.preview-silver .preview-bar {background-color:#e2ecf3f0;}.preview-silver .preview-widget {background-color:#e3edf4ed;}.preview-silver .preview-window {decorator:linear-gradient(155deg,#f0f5f9f5,#d4e0eaf5);}.preview-silver .preview-line {background-color:#52677955;}
.preview-matchday {background-color:#24252a;}.preview-matchday .preview-bar {background-color:#26282df2;}.preview-matchday .preview-widget {background-color:#2b2d33f2;}.preview-matchday .preview-window {decorator:linear-gradient(155deg,#343338f5,#202126f7);}.preview-matchday .preview-app {decorator:linear-gradient(180deg,#6a5054,#3a3038);}.preview-matchday .preview-line {background-color:#ead9da38;}
+9 -4
View File
@@ -121,6 +121,11 @@ wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut.
überstehen Speichern/Laden. Das Desktop-Widget zeigt zwei oder drei aktuelle
Überschriften und den gemeinsamen Ungelesen-Zähler.
- [Einstellungen](desktop/settings/README.md): vier Kategorien, drei Themevorschauen,
145 sichtbare Optionen, Suche, Abschnittssprünge, fünf Automatikbereiche und
Hauptschalter. Gemeinsamer Entwurf bis Anwenden, getrennte globale Speicherung
und Synchronisierung mit den vier Trainingsautomatiken.
**Anstoß führt keine Aktion aus**, weder per Maus noch per Tastatur. Das gilt
auch für die direkte Aktionsschnittstelle des Demoanbieters.
@@ -131,9 +136,9 @@ vom HTML-Mockup übertragen. Für fehlende Ports erscheinen keine vereinfachten
Ersatzlayouts. Der Katalog zählt jetzt 34 native und drei noch nicht separat
zugeordnete Routen; diese Zahl bestätigt keine vollständige gestalterische
Abnahme aller früheren Teilimplementierungen.
Der Einstellungsdialog, die vollständigen Widgetinhalte,
Mod-Importkomfort und dauerhafte globale Voreinstellungen sind noch nicht
vollständig. Übersetzungen, echte Engine-Anbindung und Plattform-Abnahme
Die vollständigen Widgetinhalte und der Mod-Importkomfort sind noch nicht
vollständig. Bildschirmkonfiguration und Audioausgabe benötigen noch die
Plattform-/Engine-Anbindung der nun gespeicherten UI-Voreinstellungen. Übersetzungen, echte Engine-Anbindung und Plattform-Abnahme
unter Windows/macOS folgen später. Dies ist kein freigegebenes Test-Release.
Die [QA-Befundliste](qa-findings.md) hält die noch offenen Abweichungen nach.
@@ -173,7 +178,7 @@ Quellcode verteilt. Ohne externe GUI-Ressourcen kann das Hauptmenü den bereits
mitgelieferten Launcher-Hintergrund verwenden.
Entwicklungsoptionen: `--gui-assets`, `--ui-scene`, `--ui-theme`, `--ui-size`,
`--ui-state`, `--ui-screenshot` und `--ui-script`. Das zeilenweise JSON-
`--ui-state`, `--ui-preferences`, `--ui-screenshot` und `--ui-script`. Das zeilenweise JSON-
Eingabeskript führt Maus-/Tastaturaktionen durch RmlUI aus; es ersetzt keine
Sessionaktionen durch direkte Zustandsmanipulation. `checkpoint` schreibt einen
wiederherstellbaren Demostand passend zu den Bildschirmaufnahmen.
+1
View File
@@ -40,6 +40,7 @@ Implementierung in der Spiel-Engine.
| Highscore | [Manager-Rangliste und zentrierte Kennzahlen](desktop/highscore/README.md) |
| Stadion | [Blöcke A–H, Ausstattung und Stadiondaten ohne Peripherieausbau](desktop/stadium/README.md) |
| Statistiken | [Neun Auswertungen, Siegerlisten, Analytics und Pokalbilder](desktop/statistics/README.md) |
| Einstellungen | [Vier Kategorien, Optionssuche, Automatik und globale UI-Voreinstellungen](desktop/settings/README.md) |
| Nachrichten | [Tablet, Postfach, Archiv, Suche, Rückgängig und Desktopvorschau](desktop/news/README.md) |
Jeder Bereich nennt die geprüfte Quelle, bestehende Funktionen und offene
+74
View File
@@ -0,0 +1,74 @@
# Einstellungen und Automatik
Stand: 25. Oktober 2026, native RmlUI-Umsetzung auf `0.3`.
Referenz ist der private HTML-Desktop mit `settings-menu.js` und
`settings-window.css` aus dem unveränderten Goldstand `197ac08c`.
## Darstellung und Bedienung
Vier Kategorien teilen sich die linke Navigation: Anzeige, Sound, Spiel und
Automatik. Im Hauptmenü stehen nur Anzeige und Sound zur Verfügung. Die
Fenstergröße und alle drei Paletten folgen den übrigen Untermenüs. Drei
unterschiedliche Miniaturdesktops zeigen die Gestaltungsvarianten; erst
„Anwenden“ ändert das tatsächliche Theme und schließt das Fenster.
Anzeige enthält Modus, fünf Beispielauflösungen, Skalierung und Sprache.
Deutsch ist aktiv; Englisch bleibt bis zur Übersetzung sichtbar und gesperrt.
Modus, Auflösung und Skalierung sind wie im POC gespeicherte UI-Auswahlen;
sie konfigurieren derzeit noch nicht das SDL-Fenster. Sound enthält Lautstärke,
Effekte und Effektstil sowie im Desktop die drei vorhandenen Spieltonoptionen.
Die Anbindung an Audioausgabe und Musik ist ein späterer Integrationsschritt.
Spiel bietet **142 Optionen in zehn Abschnitten**. Eine Suche berücksichtigt
mehrere Suchwörter, Abschnitts- und Wettbewerbsnamen sowie deutsche Umlaute
und ß. Die Abschnittsauswahl springt in den scrollbaren Optionsbereich;
leere Trefferlisten werden ausdrücklich angezeigt. Zahlenwerte nutzen die
vorhandene gemeinsame Zahleneingabe mit Feldgrenzen und Vorschlagswerten.
Die Kartenfarbe hat vier Auswahlwerte. Zusammen mit den drei Tonoptionen
werden 145 der 180 vorhandenen Optionszellen angezeigt; die übrigen Zellen
bleiben erhalten.
Automatik umfasst Aufstellung, Auswechslungen, Taktik, Manndeckung und Training.
Der Hauptschalter zeigt bei gemischter Auswahl einen Zwischenzustand. Training
schaltet bei Übernahme die vier Automatikgruppen der Trainingsansicht gemeinsam;
eine einzeln abgeschaltete Trainingsgruppe hebt umgekehrt die gemeinsame
Trainingsautomatik auf. Die eigentliche Planung übernimmt später die Engine.
Alle Kategorien bearbeiten denselben lokalen Entwurf. Kategorienwechsel und
Suche behalten die Eingaben. „Abbrechen“, Schließen und Escape verwerfen sie;
„Anwenden“ ist nur bei gültigen Änderungen aktiv. Tab und Umschalt-Tab führen
durch die sichtbaren Elemente, Pfeile navigieren zwischen den Kategorien.
Ein geöffnetes Auswahlmenü verarbeitet seine eigenen Tasten zuerst.
## Daten und spätere Engine-Anbindung
Anzeige, Theme und Sound werden atomar in
`userdata/modern-ui-preferences.json` neben der Anwendung gespeichert. Diese
Datei gilt unabhängig vom geladenen OBW und verändert weder Karriere-Revision
noch den Geändert-Status des Demostands. Für isolierte QA gibt es
`--ui-preferences <Datei>`. Fehlerhafte Dateien werden gemeldet und bleiben
bis zu einer ausdrücklichen Übernahme unverändert. Ein CLI-Theme überschreibt
nur die aktuelle Sitzung. Alte flache UI-Voreinstellungen eines Demostands
können bei fehlender globaler Datei noch eingelesen werden.
Spieloptionen und Automatik gehören zum UI-Demostand: `settings.version = 1`,
`cells` mit 180 Ganzzahlen und `automation` mit fünf Wahrheitswerten. Es werden
keine Originaldateien verändert. Alte Demostände erhalten Standardwerte; ein
bereits vorhandener fehlerhafter Block wird beim Laden zurückgewiesen.
Der revisionsgeschützte Anbieter übernimmt eine Änderung atomar; Entwürfe
bleiben an ihre Quelle und Welt gebunden. Globale Änderungen werden vor einem
lokalen Commit gespeichert; bei Ablehnung wird die vorherige Datei restauriert.
Die Optionscodes sind eine UI-Zuordnung, keine neue Engine-Regelausführung.
Diese Umsetzung greift nicht auf GameState, Zufallsquellen oder Matchfunktionen
zu. **Anstoß bleibt funktionslos.** Stadionperipherie gehört nicht zu diesem
Paket. Spieloptionen, Bildschirmkonfiguration und Audio müssen später über
validierte Session-/Plattformadapter angeschlossen werden.
## Prüfung
Synthetische Anbietertests prüfen Katalogvollständigkeit, Zellgrenzen,
Automatikabgleich, Revisionen, atomare Fehler, Migration und unabhängige globale
Dateien. Bild- und Bedienungsnachweise inklusive UI-Demoständen liegen privat
unter `bmh_4k_ui/docs/qa/settings-batch-2026-10-25/`; sie ersetzen keine
Windows-/macOS-Laufzeitabnahme.
+13
View File
@@ -206,3 +206,16 @@ unter `bmh_4k_ui/docs/qa/information-batch-2026-10-25/`.
Die 31 lokalen Regressionstests und die Linux-/OpenGL-Bildkontrolle sind keine
Behauptung einer Windows-/macOS-Laufzeitabnahme. Die gemeinsame CI baut die
opt-in Oberfläche und ihre synthetischen Tests zusätzlich auf diesen Plattformen.
Das Einstellungspaket ergänzt vier Kategorien mit gemeinsamem Entwurf,
145 sichtbaren Optionen, Abschnittssuche und Automatikmaster. Die lokale
Meilenstein-Suite besteht **32/32 Tests**, einschließlich Migration,
atomarer Fehler und getrennter globaler Voreinstellungen. Die Schriftprüfung
lädt das neue Produktionsstylesheet und prüft zusätzlich die Einstellungs-
Dropdowns und ihre Popupschrift bei vier Pixeldichten in drei Themes.
Private Vorher-/Nachher-Aufnahmen, HTML-Katalog, UI-Demostände und tatsächliche
Eingabeskripte liegen unter `bmh_4k_ui/docs/qa/settings-batch-2026-10-25/`.
Die Runtimekohorten behalten ihre tatsächlichen Binär-/Stylesheet-Hashes;
Bildkontrollen laufen unter Linux/OpenGL. Das Paket schließt keine Engine-,
Audio- oder Windows-/macOS-Laufzeitabnahme ein.
+10
View File
@@ -91,3 +91,13 @@ Silver-Button übernehmen die Referenzfarben. Pokalbilder werden bevorzugt
aus dem Weltindex geladen; die vorhandenen GUI-Studien bleiben ein
unabhängiger Ersatz. Im geprüften Umfang dieser beiden Menüs besteht nach
den gezielten Schlusskontrollen kein offener P1/P2-Befund.
Im Einstellungspaket behoben: fehlende Themevorschauen und Hilfetexte,
zu breite Footerbuttons, übergroße Vorschaukarten, abweichende Auswahlfarben
und nicht aktualisierte Status-/Treffertexte. Die Suche bezieht Hilfetexte
ein; Escape leert zunächst die Suche. Zahlenfelder öffnen die gemeinsame
Zahleneingabe auch per Tastatur. Die native Scrollbarbreite wird beim
Inhaltsabstand berücksichtigt. Anzeige und Sound werden unabhängig vom
OBW gespeichert; reine globale Änderungen verändern keinen Demostand.
Die Einstellungen verwenden weiterhin den nativen Select-Unterbau;
die bereits oben vermerkte vollständige Pickerangleichung bleibt offen.
+2
View File
@@ -132,6 +132,8 @@ int main(int argc, char** argv) {
modern_demo = true;
} else if (is("--ui-state") && value) {
modern_config.state = launch::path_from_utf8(args[++i]);
} else if (is("--ui-preferences") && value) {
modern_config.preferences = launch::path_from_utf8(args[++i]);
} else if (is("--ui-size") && value) {
const auto size = args[++i];
const auto separator = size.find('x');
+3 -3
View File
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-only
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp)
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp demo_settings.cpp ui_preferences.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui STATIC view.cpp ticket_popover.cpp)
@@ -14,7 +14,7 @@ endif()
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
FetchContent_GetProperties(rmlui)
file(MAKE_DIRECTORY "${modern_assets}")
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss)
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss settings.rcss)
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
@@ -100,7 +100,7 @@ foreach(component environment advertising toto lineup transfer stadium)
add_test(NAME modern_${component}_ui_tests COMMAND modern_${component}_ui_tests)
endforeach()
foreach(component statistics news)
foreach(component statistics news settings)
add_executable(modern_${component}_ui_tests ../../../tests/modern_${component}_ui_tests.cpp)
target_link_libraries(modern_${component}_ui_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
+13 -44
View File
@@ -133,7 +133,7 @@ void App::ProcessEvent(Rml::Event &event) try {
const auto type = event.GetType();
// Native widgets can emit intermediate selected values while their options
// are being constructed. Opening a squad menu must stay read-only.
if (setting_menu_markup_ && (menu_ == "lineup" || menu_ == "transfer" || menu_ == "news") &&
if (setting_menu_markup_ && (menu_ == "lineup" || menu_ == "transfer" || menu_ == "news" || menu_ == "settings") &&
(type == "change" || type == "input")) return;
if (type == "keydown")
keyboard_navigation_ = true;
@@ -154,6 +154,7 @@ void App::ProcessEvent(Rml::Event &event) try {
if (n->GetId() == "native-ticket-layer")
return;
if (amount_event(event)) return;
if (popup_.empty() && settings_event(event)) return;
if ((menu_ == "lineup" || menu_ == "transfer") && (type == "change" || type == "input")) {
if (auto *select = dynamic_cast<Rml::ElementFormControlSelect *>(event.GetTargetElement());
select && select->IsSelectBoxVisible()) {
@@ -246,7 +247,7 @@ void App::ProcessEvent(Rml::Event &event) try {
if (type == "mouseup" && event.GetParameter<int>("button", 0) == 1) {
if (scene_ == "desktop" && !menu_.empty() && popup_.empty()) {
menu_.clear();
draft_preferences_ = nullptr;
reset_settings();
refresh();
} else if (scene_ == "desktop" && menu_.empty() && popup_.empty()) {
std::string id;
@@ -363,7 +364,7 @@ void App::ProcessEvent(Rml::Event &event) try {
dirty_ = true;
} else if (!menu_.empty()) {
menu_.clear();
draft_preferences_ = nullptr;
reset_settings();
refresh();
} else if (scene_ == "manager") {
scene_ = "newgame";
@@ -459,6 +460,7 @@ void App::ProcessEvent(Rml::Event &event) try {
void App::dispatch(const std::string &action, Rml::Element *target) {
const auto id =
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
if (settings_action(action,target)) return;
if (lineup_action(action, target) || transfer_action(action, target)) return;
if (career_report_action(action, target) || rankings_action(action, target)) return;
if (statistics_action(action, target) || dispatch_news(action, target)) return;
@@ -678,7 +680,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
}
if (action == "close") {
menu_.clear();
draft_preferences_ = nullptr;
reset_settings();
if (scene_ != "desktop")
scene_ = "main";
refresh();
@@ -692,7 +694,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
}
if (action == "settings") {
settings_category_ = "display";
draft_preferences_ = nullptr;
reset_settings();
menu_ = "settings";
refresh();
return;
@@ -1088,7 +1090,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
planning_dialog_.clear();
if (route == "settings") {
settings_category_ = "display";
draft_preferences_ = nullptr;
reset_settings();
}
refresh();
return;
@@ -1155,37 +1157,6 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
message("Trainingslager für die Demo vorgemerkt.");
return;
}
if (action == "settings-category") {
settings_category_ = id;
refresh();
return;
}
if (action == "settings-theme") {
draft_preferences_["theme"] = id;
refresh();
return;
}
if (action == "settings-apply") {
if (settings_category_ == "display") {
for (const auto *key : {"mode", "resolution", "scale"}) {
const auto value = field(std::string("display-") + key);
if (!value.empty())
draft_preferences_[key] = value;
}
}
if (settings_category_ == "sound") {
draft_preferences_["effects"] =
element("sound-effects")->HasAttribute("checked");
draft_preferences_["sound-style"] = field("sound-style");
}
if (source_ && !apply("preferences", draft_preferences_))
return;
theme_ = draft_preferences_.value("theme", theme_);
draft_preferences_ = nullptr;
menu_.clear();
refresh();
return;
}
if (action == "save-select") {
selections_["save"] = id;
refresh();
@@ -1230,7 +1201,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
desktop_ =
source_->load(user_dir() / "saves" / editor::path(name + ".json"));
saved_desktop_ = desktop_;
theme_ = snap().state.at("preferences").value("theme", theme_);
if(!ui_preferences_loaded_){ui_preferences_=legacy_ui_preferences(snap().state.at("preferences"));theme_=ui_preferences_.at("theme").get<std::string>();}
menu_.clear();
scene_ = "desktop";
refresh();
@@ -1279,6 +1250,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
}
}
void App::change(Rml::Element *target) {
if(settings_change(target))return;
const auto kind = target->GetAttribute<Rml::String>("data-change", "");
auto *control = dynamic_cast<Rml::ElementFormControl *>(target);
if (!control)
@@ -1342,6 +1314,7 @@ void App::change(Rml::Element *target) {
}
}
void App::input(Rml::Element *target) {
if(settings_change(target))return;
const auto kind = target->GetAttribute<Rml::String>("data-input", "");
auto *control = dynamic_cast<Rml::ElementFormControl *>(target);
if (!control)
@@ -1359,12 +1332,7 @@ void App::input(Rml::Element *target) {
}
return;
}
if (kind == "sound-volume") {
const int n = std::stoi(value);
draft_preferences_["volume"] = n;
element("volume-value")->SetInnerRML(std::to_string(n) + " %");
dirty_ = true;
}
if (kind == "camp-focus") {
const auto i = std::stoi(target->GetAttribute<Rml::String>("data-id", "0"));
if (i < 0 || i > 2)
@@ -1469,6 +1437,7 @@ void App::script() {
{"transfer_view", transfer_view_}, {"transfer_dialog", transfer_dialog_}, {"transfer_draft", transfer_draft_},
{"career_view", career_view_}, {"rankings_view", rankings_view_},
{"stadium_view", stadium_view_},
{"ui_preferences",ui_preferences_}, {"settings_draft",settings_draft_}, {"settings_category",settings_category_}, {"settings_query",settings_query_}, {"settings_notice",settings_notice_},
{"statistics_view", statistics_view_}, {"statistics_trophy", statistics_trophy_},
{"statistics_scrolls", statistics_scrolls_},
{"news_view", news_view_}, {"news_dialog", news_dialog_},
File diff suppressed because it is too large. Load diff
+15
View File
@@ -0,0 +1,15 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "modern/ui/catalog.hpp"
namespace bmh::modern_ui {
// Presentation preferences only. Codes preserve the handbook's UI addresses;
// they neither change Modern rules nor start any automatic game operation.
const Json &settings_catalogue();
int settings_index(const std::string &code);
Json default_demo_settings(const Json &full_state);
bool valid_demo_settings(const Json &full_state);
bool migrate_demo_settings(Json &full_state);
void sync_demo_settings_training(Json &full_state);
std::string edit_demo_settings(Json &full_state, const Json &settings);
std::string settings_search_key(std::string);
} // namespace bmh::modern_ui
+10 -1
View File
@@ -13,6 +13,7 @@
#include "modern/ui/demo_stadium.hpp"
#include "modern/ui/demo_statistics.hpp"
#include "modern/ui/demo_news.hpp"
#include "modern/ui/demo_settings.hpp"
#include "modern/ui/desktop.hpp"
#include <algorithm>
#include <chrono>
@@ -103,6 +104,8 @@ DemoSource::DemoSource(std::shared_ptr<const Catalog> catalog)
throw editor::Error("invalid_demo_stadium");
if (!migrate_demo_news(state_, *catalog_))
throw editor::Error("invalid_demo_news");
if (!migrate_demo_settings(state_))
throw editor::Error("invalid_demo_settings");
saved_ = state_;
}
Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; }
@@ -117,7 +120,10 @@ ActionResult DemoSource::apply(const Action &action) {
return {false, revision_, "stale_revision"};
auto next = state_;
try {
if (action.kind == "news") {
if (action.kind == "settings") {
const auto error = edit_demo_settings(next, action.value);
if (!error.empty()) return {false, revision_, error};
} else if (action.kind == "news") {
const auto error = edit_demo_news(next, action.value, *catalog_);
if (!error.empty())
return {false, revision_, error};
@@ -231,6 +237,7 @@ ActionResult DemoSource::apply(const Action &action) {
} catch (const Json::exception &) {
return {false, revision_, "invalid_action"};
}
sync_demo_settings_training(next);
state_ = std::move(next);
return {true, ++revision_, {}};
}
@@ -302,6 +309,8 @@ Json DemoSource::load(const fs::path &file) {
throw editor::Error("invalid_demo_stadium");
if (!migrate_demo_news(data, *catalog_))
throw editor::Error("invalid_demo_news");
if (!migrate_demo_settings(data))
throw editor::Error("invalid_demo_settings");
auto next = data;
auto desktop = next.value("desktop", Json::object());
if (!migrate_desktop(desktop))
-109
View File
@@ -711,115 +711,6 @@ std::string App::render_camp() {
btn("camp-remember", "Vormerken", "primary") + "</div></div>";
return body;
}
std::string App::render_settings() {
if (draft_preferences_.is_null())
draft_preferences_ =
source_ ? snap().state.at("preferences")
: Json{{"theme", theme_}, {"volume", 80}, {"effects", true}};
std::string nav;
for (const auto &[key, label] :
std::vector<std::pair<std::string, std::string>>{
{"display", "Anzeige"},
{"sound", "Sound"},
{"game", "Spiel"},
{"automation", "Automatik"}}) {
if (scene_ == "main" && (key == "game" || key == "automation"))
continue;
nav += btn("settings-category", label,
settings_category_ == key ? "primary" : "",
"data-id=\"" + key +
"\" "
"style=\"display:flex;justify-content:flex-start;width:100%;"
"height:100dp;margin-"
"bottom:14dp;text-align:left;\"");
}
std::string pane = "<h2>" +
std::string(settings_category_ == "display" ? "Anzeige"
: settings_category_ == "sound" ? "Sound"
: settings_category_ == "game" ? "Spiel"
: "Automatik") +
"</h2>";
if (settings_category_ == "display") {
pane +=
"<h3 style=\"margin:40dp 0 24dp;\">Gestaltung</h3><div class=\"row\">";
for (const auto &[id, name] :
std::vector<std::pair<std::string, std::string>>{
{"midnight", "Midnight Glass"},
{"silver", "Silver Glass"},
{"matchday", "Matchday"}})
pane +=
btn("settings-theme",
img("background", 520, 270, false, true, 650) +
"<p style=\"margin-top:20dp;\">" + name + "</p>",
std::string("choice ") +
(draft_preferences_.value("theme", theme_) == id ? "selected"
: ""),
"data-id=\"" + id + "\" style=\"width:570dp;padding:20dp;\"");
pane +=
"</div><h3 style=\"margin-top:50dp;\">Bildschirm</h3><div "
"class=\"field-row\"><label>Modus</label>" +
select("display-mode",
{{"window", "Fenster"}, {"fullscreen", "Vollbild"}},
draft_preferences_.value("mode", "window")) +
"</div><div class=\"field-row\"><label>Auflösung</label>" +
select("display-resolution",
{{"1280x720", "1280 × 720"},
{"1920x1080", "1920 × 1080"},
{"2560x1440", "2560 × 1440"},
{"3840x2160", "3840 × 2160"}},
draft_preferences_.value("resolution", "1920x1080")) +
"</div><div class=\"field-row\"><label>Skalierung</label>" +
select("display-scale",
{{"auto", "Auto"}, {"1", "1×"}, {"1.5", "1,5×"}, {"2", "2×"}},
draft_preferences_.value("scale", "auto")) +
"</div><div class=\"field-row\"><label>Sprache</label><select "
"id=\"display-language\"><option value=\"de\" "
"selected>Deutsch</option><option "
"disabled>Englisch</option></select></div>";
} else if (settings_category_ == "sound")
pane +=
"<div class=\"field-row\"><label>Lautstärke</label><input "
"type=\"range\" min=\"0\" max=\"100\" value=\"" +
std::to_string(draft_preferences_.value("volume", 80)) +
"\" id=\"sound-volume\" data-input=\"sound-volume\"/><span "
"id=\"volume-value\">" +
std::to_string(draft_preferences_.value("volume", 80)) +
" %</span></div><div class=\"field-row\"><label>Effekte</label><input "
"type=\"checkbox\" id=\"sound-effects\" " +
(draft_preferences_.value("effects", true) ? "checked" : "") +
"/></div><div class=\"field-row\"><label>Effektstil</label>" +
select("sound-style", {{"classic", "Klassisch"}, {"modern", "Modern"}},
draft_preferences_.value("sound-style", "classic")) +
"</div>";
else if (settings_category_ == "automation") {
pane += "<div class=\"field-row\"><label>Alles automatisch</label><input "
"type=\"checkbox\" data-change=\"automation-all\"/></div>";
for (const auto *name :
{"Aufstellung", "Auswechslungen", "Taktik", "Manndeckung", "Training"})
pane += "<div class=\"field-row\"><label>" + std::string(name) +
"</label><input type=\"checkbox\"/></div>";
} else
pane +=
std::string(
"<div class=\"field-row\"><label>Spieloption suchen</label><input "
"type=\"text\" id=\"settings-search\"/></div><div "
"class=\"field-row\"><label>Reality-Modus</label><input "
"type=\"checkbox\"/></div><div "
"class=\"field-row\"><label>Spielszenen anzeigen</label><input "
"type=\"checkbox\"/></div><div class=\"field-row\"><label>Desktop "
"am Raster ausrichten</label><input type=\"checkbox\" ") +
(desktop_.value("grid", true) ? "checked" : "") + "/></div>";
return "<div class=\"panel\" "
"style=\"position:absolute;left:0;top:0;width:370dp;bottom:150dp;"
"padding:24dp 20dp;\">" +
nav +
"</div><div class=\"panel list\" "
"style=\"position:absolute;left:410dp;right:0;top:0;bottom:150dp;"
"padding:36dp;\">" +
pane + "</div><div class=\"bottom-controls\">" +
btn("close", "Abbrechen") +
btn("settings-apply", "Anwenden", "primary") + "</div>";
}
std::string App::render_save(bool save) {
const auto directory = user_dir() / "saves";
std::string body = "<div class=\"panel list\" "
+460
View File
@@ -0,0 +1,460 @@
// SPDX-License-Identifier: GPL-3.0-only
void App::settings_remember_scroll() {
if (menu_ == "settings" && last_rendered_menu_ == "settings")
if (auto *pane = element("settings-options"))
settings_scrolls_[settings_rendered_category_.empty()
? settings_category_
: settings_rendered_category_] =
pane->GetScrollTop();
}
void App::settings_after_render() {
if (menu_ != "settings")
return;
settings_sync();
settings_rendered_category_ = settings_category_;
if (settings_category_ == "game") {
int count = 0;
render_settings_groups(&count);
if (auto *label = element("settings-search-count"))
label->SetInnerRML(std::to_string(count) + (settings_query_.empty()
? " Optionen"
: " von 142 Optionen"));
}
if (settings_restore_scroll_) {
context_->Update();
if (auto *pane = element("settings-options"))
pane->SetScrollTop(settings_scrolls_.value(settings_category_, 0.f));
settings_restore_scroll_ = false;
}
context_->Update();
}
void App::settings_sync() {
if (menu_ != "settings" || !settings_draft_.is_object())
return;
const bool valid = settings_valid(), changed = settings_dirty();
if (auto *button = element("settings-apply")) {
if (valid && changed)
button->RemoveAttribute("disabled");
else
button->SetAttribute("disabled", true);
}
if (auto *status = element("settings-draft-status"))
status->SetInnerRML(esc(!valid ? "Bitte die Spielwerte prüfen."
: !settings_notice_.empty() ? settings_notice_
: changed ? "Nicht angewendete Änderungen"
: "Keine Änderungen"));
if (auto *style = element("preference-style")) {
if (settings_draft_.at("global").at("sound").at("effects") == true)
style->RemoveAttribute("disabled");
else
style->SetAttribute("disabled", true);
}
Rml::ElementList toggles;
doc_->QuerySelectorAll(toggles, ".settings-switch");
for (auto *toggle : toggles) {
const auto scope = toggle->GetAttribute<Rml::String>("data-scope", ""),
key = toggle->GetAttribute<Rml::String>("data-key", "");
bool on = false, mixed = false;
if (scope == "sound")
on = settings_draft_["global"]["sound"].at(key).get<bool>();
else if (scope == "cell")
on = settings_draft_["local"]["cells"][size_t(settings_index(key))] == 1;
else if (scope == "automation") {
const auto &a = settings_draft_["local"]["automation"];
if (key == "all") {
int n = 0;
for (const auto &[k, v] : a.items())
if (v == true)
++n;
on = n == 5;
mixed = n > 0 && n < 5;
} else
on = a.at(key).get<bool>();
}
toggle->SetClass("checked", on);
toggle->SetClass("mixed", mixed);
toggle->SetAttribute("aria-checked", mixed ? "mixed"
: on ? "true"
: "false");
if (auto *knob = toggle->QuerySelector(".settings-switch-knob"))
knob->SetProperty("left", std::string(mixed ? "25"
: on ? "45"
: "5") +
"dp");
}
for (const auto *theme : {"midnight", "silver", "matchday"})
if (auto *button = element(std::string("settings-theme-") + theme))
button->SetAttribute(
"aria-pressed",
settings_draft_["global"]["theme"] == theme ? "true" : "false");
if (auto *clear = element("settings-search-clear")) {
if (settings_query_.empty())
clear->SetAttribute("disabled", true);
else
clear->RemoveAttribute("disabled");
}
dirty_ = true;
}
void App::settings_filter() {
if (menu_ != "settings" || settings_category_ != "game")
return;
int count = 0;
const auto html = render_settings_groups(&count);
setting_menu_markup_ = true;
if (auto *groups = element("settings-groups"))
groups->SetInnerRML(html);
setting_menu_markup_ = false;
if (auto *label = element("settings-search-count"))
label->SetInnerRML(std::to_string(count) + (settings_query_.empty()
? " Optionen"
: " von 142 Optionen"));
if (auto *select = dynamic_cast<Rml::ElementFormControlSelect *>(
element("settings-jump"))) {
std::string choices;
std::string first;
for (const auto &g : settings_catalogue().at("groups")) {
const auto id = g.at("id").get<std::string>();
const bool shown = element("settings-group-" + id) != nullptr;
if (shown && first.empty())
first = id;
choices += "<option value=\"" + id + "\" " + (shown ? "" : "disabled") +
">" + esc(g.at("title").get<std::string>()) + "</option>";
}
if (!element("settings-group-" + settings_jump_))
settings_jump_ = first;
setting_menu_markup_ = true;
select->SetInnerRML(choices);
select->SetValue(settings_jump_);
setting_menu_markup_ = false;
if (count)
select->RemoveAttribute("disabled");
else
select->SetAttribute("disabled", true);
}
settings_scrolls_["game"] = 0.f;
context_->Update();
if (auto *pane = element("settings-options"))
pane->SetScrollTop(0);
center_selects(*doc_);
settings_sync();
}
bool App::settings_change(Rml::Element *target) {
if (menu_ != "settings" || !target || !settings_draft_.is_object())
return false;
const auto id = target->GetId();
if (id == "settings-search") {
settings_query_ = field(id);
settings_filter();
return true;
}
if (id == "preference-volume") {
try {
settings_draft_["global"]["sound"]["volume"] =
std::clamp(int(std::lround(std::stod(field(id)))), 0, 100);
} catch (const std::exception &) {
return true;
}
if (auto *label = element("settings-volume-value"))
label->SetInnerRML(
std::to_string(
settings_draft_["global"]["sound"]["volume"].get<int>()) +
" %");
settings_notice_.clear();
settings_sync();
return true;
}
const auto scope =
target->GetAttribute<Rml::String>("data-settings-scope", "");
if (scope.empty())
return false;
const auto key = target->GetAttribute<Rml::String>("data-settings-key", ""),
section =
target->GetAttribute<Rml::String>("data-settings-section", "");
const auto value = field(id);
if (scope == "jump") {
if (auto *group = element("settings-group-" + value)) {
settings_jump_ = value;
if (auto *pane = element("settings-options")) {
const auto offset =
group->GetAbsoluteOffset().y - pane->GetAbsoluteOffset().y;
pane->SetScrollTop(pane->GetScrollTop() + offset);
settings_scrolls_["game"] = pane->GetScrollTop();
}
}
dirty_ = true;
return true;
}
if (scope == "global")
settings_draft_["global"][section][key] = value;
else if (scope == "number" || scope == "cell") {
const int index = settings_index(key);
if (index < 0)
return true;
const bool digits = !value.empty() && value.size() <= 2 &&
std::all_of(value.begin(), value.end(), [](char c) {
return c >= '0' && c <= '9';
});
settings_draft_["local"]["cells"][size_t(index)] =
digits ? Json(std::stoi(value)) : Json();
}
settings_notice_.clear();
settings_sync();
return true;
}
void App::settings_commit() {
if (!settings_dirty() || !settings_valid())
return;
const bool local = !settings_global_only();
if (local &&
(settings_source_ != source_.get() || settings_world_ != world_ ||
settings_revision_ != snap().revision)) {
settings_notice_ =
"Die Anzeige ist veraltet. Bitte schließen und erneut öffnen.";
settings_sync();
return;
}
const auto global = settings_draft_.at("global");
const bool changed_global = global != settings_base_.at("global");
const bool changed_local =
local && settings_draft_.at("local") != settings_base_.at("local");
const auto file = ui_preferences_file();
const bool had_file = fs::exists(file);
std::string previous;
try {
if (changed_global) {
if (had_file)
previous = editor::read_file(file);
save_ui_preferences(file, global);
}
if (changed_local) {
const auto result = source_->apply(
{settings_revision_, "settings", settings_draft_.at("local")});
if (!result.ok) {
if (changed_global) {
if (had_file)
editor::write_atomic(file, previous);
else
fs::remove(file);
}
settings_notice_ =
"Änderungen konnten nicht übernommen werden. Bitte erneut öffnen.";
settings_sync();
return;
}
}
} catch (const std::exception &) {
settings_notice_ = "Änderungen konnten nicht gespeichert werden.";
settings_sync();
return;
}
ui_preferences_ = global;
theme_ = global.at("theme").get<std::string>();
if (changed_global)
ui_preferences_loaded_ = true;
reset_settings();
menu_.clear();
refresh();
}
bool App::settings_action(const std::string &action, Rml::Element *target) {
if (!action.starts_with("settings-"))
return false;
if (menu_ != "settings")
return false;
begin_settings();
if (action == "settings-apply") {
settings_commit();
return true;
}
if (action == "settings-cancel") {
reset_settings();
menu_.clear();
refresh();
return true;
}
const auto id =
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
if (action == "settings-category") {
if (id != "display" && id != "sound" &&
(settings_global_only() || (id != "game" && id != "automation")))
return true;
settings_remember_scroll();
settings_category_ = id;
focus_after_render_ = "settings-tab-" + id;
refresh();
return true;
}
if (action == "settings-theme") {
if (id == "midnight" || id == "silver" || id == "matchday")
settings_draft_["global"]["theme"] = id;
settings_notice_.clear();
settings_sync();
return true;
}
if (action == "settings-search-clear") {
settings_query_.clear();
if (auto *input =
dynamic_cast<Rml::ElementFormControl *>(element("settings-search")))
input->SetValue("");
settings_filter();
if (auto *input = element("settings-search"))
input->Focus(true);
return true;
}
if (!target)
return true;
if (action == "settings-toggle") {
const auto scope = target->GetAttribute<Rml::String>("data-scope", ""),
key = target->GetAttribute<Rml::String>("data-key", "");
if (scope == "sound" && key == "effects")
settings_draft_["global"]["sound"][key] =
!settings_draft_["global"]["sound"][key].get<bool>();
else if (!settings_global_only() && scope == "cell" &&
settings_index(key) >= 0) {
auto &value =
settings_draft_["local"]["cells"][size_t(settings_index(key))];
value = value == 1 ? 0 : 1;
} else if (!settings_global_only() && scope == "automation") {
auto &a = settings_draft_["local"]["automation"];
if (key == "all") {
const bool on = !std::all_of(a.begin(), a.end(),
[](const Json &v) { return v == true; });
for (auto &[k, v] : a.items())
v = on;
} else if (a.contains(key))
a[key] = !a[key].get<bool>();
}
settings_notice_.clear();
settings_sync();
return true;
}
return false;
}
bool App::settings_event(Rml::Event &event) {
if (menu_ != "settings" || !popup_.empty() || amount_)
return false;
begin_settings();
const auto type = event.GetType();
auto *target = event.GetTargetElement();
if (type == "input" || type == "change") {
if (auto *select = dynamic_cast<Rml::ElementFormControlSelect *>(target);
select && select->IsSelectBoxVisible()) {
pending_selects_.insert(select->GetId());
dirty_ = true;
return true;
}
if (settings_change(target))
return true;
}
const auto pressed_key =
type == "keydown" ? Rml::Input::KeyIdentifier(
event.GetParameter<int>("key_identifier", 0))
: Rml::Input::KI_UNKNOWN;
const int digit =
pressed_key >= Rml::Input::KI_0 && pressed_key <= Rml::Input::KI_9
? pressed_key - Rml::Input::KI_0
: pressed_key >= Rml::Input::KI_NUMPAD0 &&
pressed_key <= Rml::Input::KI_NUMPAD9
? pressed_key - Rml::Input::KI_NUMPAD0
: -1;
const bool numeric_key =
type == "keydown" && !event.GetParameter<int>("ctrl_key", 0) &&
!event.GetParameter<int>("meta_key", 0) &&
!event.GetParameter<int>("alt_key", 0) &&
(digit >= 0 || pressed_key == Rml::Input::KI_RETURN ||
pressed_key == Rml::Input::KI_NUMPADENTER ||
pressed_key == Rml::Input::KI_SPACE ||
pressed_key == Rml::Input::KI_F4 || pressed_key == Rml::Input::KI_UP ||
pressed_key == Rml::Input::KI_DOWN ||
pressed_key == Rml::Input::KI_BACK ||
pressed_key == Rml::Input::KI_DELETE);
if (((type == "mousedown" && event.GetParameter<int>("button", 0) == 0) ||
numeric_key) &&
target->HasAttribute("data-settings-max")) {
const auto key = target->GetAttribute<Rml::String>("data-settings-key", "");
const int index = settings_index(key),
maximum = target->GetAttribute<int>("data-settings-max", 9);
if (index >= 0) {
const auto &old = settings_draft_["local"]["cells"][size_t(index)];
AmountRequest request;
request.title = target->GetAttribute<Rml::String>("data-settings-title",
"Spieloption " + key);
request.return_focus = target->GetId();
request.value = old.is_number_integer() ? old.get<int>() : 0;
request.max = maximum;
request.step = request.suggestion_step = 1;
request.review = false;
request.accept = [this, index](int64_t value) {
if (menu_ != "settings" || !settings_draft_.is_object())
return false;
settings_draft_["local"]["cells"][size_t(index)] = value;
settings_notice_.clear();
return true;
};
open_amount(std::move(request));
if (amount_ && digit >= 0) {
amount_->raw = std::to_string(digit);
amount_select_all_ = false;
amount_caret_end_ = true;
}
event.StopImmediatePropagation();
return true;
}
}
if (type != "keydown")
return false;
const auto key =
Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier", 0));
if (auto *select = dynamic_cast<Rml::ElementFormControlSelect *>(target);
select && select->IsSelectBoxVisible())
return false;
if (key == Rml::Input::KI_ESCAPE && target->GetId() == "settings-search" &&
!settings_query_.empty()) {
settings_action("settings-search-clear", nullptr);
event.StopImmediatePropagation();
return true;
}
if (key == Rml::Input::KI_TAB) {
Rml::ElementList controls;
if (auto *canvas = element("canvas"))
canvas->QuerySelectorAll(
controls,
".window button,.window input,.window select,#settings-options");
std::erase_if(controls, [](auto *node) {
return !node->IsVisible(true) || node->HasAttribute("disabled");
});
if (!controls.empty()) {
const auto it = std::find(controls.begin(), controls.end(),
context_->GetFocusElement());
const int pos = it == controls.end() ? -1 : int(it - controls.begin()),
n = int(controls.size());
const bool back = event.GetParameter<int>("shift_key", 0) != 0;
const int next =
pos < 0 ? (back ? n - 1 : 0) : (pos + (back ? -1 : 1) + n) % n;
controls[size_t(next)]->Focus(true);
controls[size_t(next)]->ScrollIntoView(
Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
}
event.StopImmediatePropagation();
return true;
}
if (target->GetId().starts_with("settings-tab-") &&
(key == Rml::Input::KI_UP || key == Rml::Input::KI_DOWN ||
key == Rml::Input::KI_HOME || key == Rml::Input::KI_END)) {
const std::vector<std::string> tabs =
settings_global_only() ? std::vector<std::string>{"display", "sound"}
: std::vector<std::string>{"display", "sound",
"game", "automation"};
const auto it = std::find(tabs.begin(), tabs.end(), settings_category_);
int pos = int(it - tabs.begin());
pos = key == Rml::Input::KI_HOME ? 0
: key == Rml::Input::KI_END
? int(tabs.size() - 1)
: (pos + (key == Rml::Input::KI_UP ? -1 : 1) + int(tabs.size())) %
int(tabs.size());
if (auto *button = element("settings-tab-" + tabs[size_t(pos)]))
settings_action("settings-category", button);
event.StopImmediatePropagation();
return true;
}
return false;
}
+353
View File
@@ -0,0 +1,353 @@
// SPDX-License-Identifier: GPL-3.0-only
bool App::settings_global_only() const { return scene_ == "main" || !source_; }
fs::path App::ui_preferences_file() const {
return config_.preferences.empty()
? root_ / "userdata" / "modern-ui-preferences.json"
: config_.preferences;
}
void App::reset_settings() {
settings_draft_ = Json();
settings_base_ = Json();
settings_notice_.clear();
settings_query_.clear();
settings_jump_ = "rules";
settings_category_ = "display";
settings_scrolls_ = Json::object();
settings_restore_scroll_ = false;
settings_rendered_category_.clear();
settings_world_.reset();
settings_source_ = nullptr;
settings_revision_ = 0;
}
void App::begin_settings() {
if (!settings_draft_.is_null())
return;
settings_draft_ = {{"global", ui_preferences_}};
if (!settings_global_only()) {
const auto s = snap();
settings_draft_["local"] = s.state.at("settings");
settings_revision_ = s.revision;
settings_world_ = s.world;
settings_source_ = source_.get();
}
settings_base_ = settings_draft_;
}
bool App::settings_dirty() const {
return settings_draft_.is_object() && settings_draft_ != settings_base_;
}
bool App::settings_valid() const {
if (!settings_draft_.is_object() ||
!valid_ui_preferences(settings_draft_.at("global")))
return false;
if (settings_global_only())
return true;
auto copy = snap().state;
return edit_demo_settings(copy, settings_draft_.at("local")).empty();
}
std::string App::settings_row(const std::string &id, const std::string &label,
const std::string &help,
const std::string &control) const {
return "<div class=\"settings-row\"><label for=\"" + esc(id) + "\"><span>" +
esc(label) + "</span>" +
(help.empty() ? "" : "<small>" + esc(help) + "</small>") + "</label>" +
control + "</div>";
}
std::string App::settings_switch(const std::string &id,
const std::string &scope,
const std::string &key, bool on,
bool mixed) const {
return btn("settings-toggle",
"<span class=\"settings-switch-knob\" style=\"left:" +
std::string(mixed ? "25"
: on ? "45"
: "5") +
"dp;\"></span>",
"settings-switch " + std::string(on ? "checked " : "") +
(mixed ? "mixed" : ""),
"id=\"" + esc(id) + "\" role=\"switch\" aria-checked=\"" +
(mixed ? "mixed"
: on ? "true"
: "false") +
"\" data-scope=\"" + scope + "\" data-key=\"" + key + "\"");
}
std::string App::settings_select(
const std::string &id,
const std::vector<std::pair<std::string, std::string>> &rows,
const std::string &value, const std::string &scope,
const std::string &section, const std::string &key) const {
std::string out = "<select class=\"settings-select\" id=\"" + id +
"\" data-settings-scope=\"" + scope +
"\" data-settings-section=\"" + section +
"\" data-settings-key=\"" + key + "\">";
for (const auto &[v, label] : rows)
out += "<option value=\"" + esc(v) + "\" " +
(v == value ? "selected " : "") +
(id == "preference-language" && v == "en" ? "disabled " : "") + ">" +
esc(label) + "</option>";
return out + "</select>";
}
std::string App::settings_option(const Json &option) const {
const auto code = option.at("code").get<std::string>(),
id = "game-setting-" + code;
const auto &value =
settings_draft_.at("local").at("cells")[size_t(settings_index(code))];
const auto type = option.at("type").get<std::string>();
std::string control;
if (type == "toggle")
control = settings_switch(id, "cell", code, value == 1);
else if (type == "choice") {
std::vector<std::pair<std::string, std::string>> rows;
for (const auto &choice : option.at("choices"))
rows.emplace_back(std::to_string(choice[0].get<int>()),
choice[1].get<std::string>());
control = settings_select(
id, rows,
value.is_number_integer() ? std::to_string(value.get<int>()) : "",
"cell", "", code);
} else
control =
"<input class=\"settings-number\" type=\"text\" id=\"" + id +
"\" data-settings-scope=\"number\" data-settings-key=\"" + code +
"\" data-settings-title=\"" +
esc(option.at("label").get<std::string>()) + "\" data-settings-max=\"" +
std::to_string(option.at("max").get<int>()) +
"\" maxlength=\"2\" value=\"" +
(value.is_number_integer() ? std::to_string(value.get<int>()) : "") +
"\"/>";
return settings_row(id, option.at("label").get<std::string>(),
option.value("help", ""), control);
}
std::string App::render_settings_groups(int *count) const {
std::istringstream words(settings_search_key(settings_query_));
std::vector<std::string> terms;
for (std::string word; words >> word;)
terms.push_back(word);
int found = 0;
std::string out;
for (const auto &group : settings_catalogue().at("groups")) {
std::string rows;
const auto matches = [&](const Json &o, const std::string &competition) {
const auto text = settings_search_key(
group.at("title").get<std::string>() + " " + competition + " " +
o.at("label").get<std::string>() + " " + o.value("help", ""));
return std::all_of(terms.begin(), terms.end(), [&](const auto &w) {
return text.find(w) != text.npos;
});
};
if (group.contains("options")) {
for (const auto &o : group.at("options"))
if (matches(o, "")) {
rows += settings_option(o);
++found;
}
} else
for (const auto &competition : group.at("competitions")) {
std::string entries;
for (const auto &o : competition.at("options"))
if (matches(o, competition.at("title").get<std::string>())) {
entries += settings_option(o);
++found;
}
if (!entries.empty())
rows += "<div class=\"settings-competition\"><h4>" +
esc(competition.at("title").get<std::string>()) + "</h4>" +
entries + "</div>";
}
if (!rows.empty())
out += "<div id=\"settings-group-" + group.at("id").get<std::string>() +
"\" class=\"settings-group\"><h3>" +
esc(group.at("title").get<std::string>()) + "</h3>" +
(group.contains("help")
? "<p class=\"settings-group-help\">" +
esc(group.at("help").get<std::string>()) + "</p>"
: "") +
rows + "</div>";
}
if (count)
*count = found;
if (!found)
out = "<p class=\"settings-search-empty\"><span>Keine Einstellungen "
"gefunden.</span><small>Versuche einen anderen "
"Suchbegriff.</small></p>";
return out;
}
std::string App::render_settings() {
begin_settings();
settings_remember_scroll();
const auto &p = settings_draft_.at("global");
std::string nav, pane;
const std::array<std::pair<const char *, const char *>, 4> categories{
{{"display", "Anzeige"},
{"sound", "Sound"},
{"game", "Spiel"},
{"automation", "Automatik"}}};
for (const auto &[id, label] : categories)
if (!settings_global_only() || std::string(id) == "display" ||
std::string(id) == "sound")
nav += btn("settings-category", "<span>" + std::string(label) + "</span>",
settings_category_ == id ? "active" : "",
"id=\"settings-tab-" + std::string(id) +
"\" role=\"tab\" aria-selected=\"" +
(settings_category_ == id ? "true" : "false") +
"\" data-id=\"" + id + "\"");
const std::map<std::string, std::pair<std::string, std::string>> captions = {
{"display", {"Anzeige", "Bildschirm und Sprache"}},
{"sound", {"Sound", "Lautstärke, Effekte und Spielton"}},
{"game", {"Spiel", "Spielablauf und Darstellung nach dem Handbuch"}},
{"automation",
{"Automatik",
"Aufstellung, Wechsel, Taktik, Manndeckung und Training"}}};
std::string head = "<div><h2>" + captions.at(settings_category_).first +
"</h2><p>" + captions.at(settings_category_).second +
"</p></div>";
if (settings_category_ == "display") {
pane =
"<div class=\"settings-group\"><h3>Gestaltung</h3><p "
"class=\"settings-group-help\">Wähle deinen Look. Die Gestaltung wird "
"mit „Anwenden“ übernommen.</p><div class=\"settings-theme-options\">";
const std::array<std::array<const char *, 3>, 3> themes{
{{{"midnight", "Midnight Glass",
"Dunkles Glas · ruhige Blautöne · Mint"}},
{{"silver", "Silver Glass",
"Helles Glas · klare Schrift · Silberblau"}},
{{"matchday", "Matchday", "Graphit · klare Flächen · Vereinsrot"}}}};
for (const auto &t : themes) {
const std::string type = t[0];
const auto mini =
"<div class=\"settings-theme-preview preview-" + type +
"\"><div class=\"preview-background\">" +
img("background", 647.333333, 404.583333, false, true, 650) +
"</div><div class=\"preview-bar\"><span></span></div><div "
"class=\"preview-widget one\"></div><div class=\"preview-widget "
"two\"></div><div class=\"preview-app app-one\"></div><div "
"class=\"preview-app app-two\"></div><div class=\"preview-app "
"app-three\"></div><div class=\"preview-window\"><div "
"class=\"preview-title\"><span></span></div><div "
"class=\"preview-line line-one\"></div><div class=\"preview-line "
"line-two\"></div><div class=\"preview-line "
"line-three\"></div></div></div>";
pane +=
btn("settings-theme",
mini + "<strong>" + t[1] + "</strong><small>" + t[2] + "</small>",
"settings-theme-choice",
"id=\"settings-theme-" + type + "\" data-id=\"" + type +
"\" aria-pressed=\"" +
(p.at("theme") == type ? "true" : "false") + "\"");
}
pane += "</div></div><div class=\"settings-group\"><h3>Bildschirm</h3>";
const auto pref =
[&](const char *key, const char *label,
const std::vector<std::pair<std::string, std::string>> &rows,
const char *help = "") {
return settings_row(
std::string("preference-") + key, label, help,
settings_select(std::string("preference-") + key, rows,
p.at("display").at(key).get<std::string>(),
"global", "display", key));
};
pane += pref("mode", "Modus",
{{"fullscreen", "Vollbild"}, {"window", "Fenster"}});
pane += pref("resolution", "Auflösung",
{{"1280x720", "1280 × 720"},
{"1600x900", "1600 × 900"},
{"1920x1080", "1920 × 1080"},
{"2560x1440", "2560 × 1440"},
{"3840x2160", "3840 × 2160"}},
"Beispielauflösungen für den POC.");
pane +=
pref("scale", "Skalierung",
{{"auto", "Auto"}, {"1", "1×"}, {"1.5", "1,5×"}, {"2", "2×"}}) +
"</div><div class=\"settings-group\"><h3>Sprache</h3>" +
pref("language", "Sprache", {{"de", "Deutsch"}, {"en", "Englisch"}}) +
"</div>";
} else if (settings_category_ == "sound") {
const auto &s = p.at("sound");
pane = "<div class=\"settings-group\"><h3>Lautstärke und Effekte</h3>";
pane += settings_row(
"preference-volume", "Lautstärke", "",
"<div class=\"settings-volume\"><input type=\"range\" "
"id=\"preference-volume\" min=\"0\" max=\"100\" step=\"1\" value=\"" +
std::to_string(s.at("volume").get<int>()) +
"\"/><span id=\"settings-volume-value\">" +
std::to_string(s.at("volume").get<int>()) + " %</span></div>");
pane +=
settings_row("preference-effects", "Effekte", "",
settings_switch("preference-effects", "sound", "effects",
s.at("effects").get<bool>()));
pane += settings_row("preference-style", "Effektstil", "",
settings_select(
"preference-style",
{{"classic", "Klassisch"}, {"modern", "Modern"}},
s.at("style").get<std::string>(), "global",
"sound", "style")) +
"</div>";
if (!settings_global_only()) {
pane += "<div class=\"settings-group\"><h3>Ton im Spiel</h3>";
for (const auto &o : settings_catalogue().at("sound"))
pane += settings_option(o);
pane += "</div>";
}
} else if (settings_category_ == "automation") {
const auto &a = settings_draft_.at("local").at("automation");
int on = 0;
for (const auto &[k, v] : a.items())
if (v == true)
++on;
pane = "<div class=\"settings-automation-master\">" +
settings_row("automation-all", "Alles automatisch",
"Alle fünf Bereiche gemeinsam ein- oder ausschalten.",
settings_switch("automation-all", "automation", "all",
on == 5, on > 0 && on < 5)) +
"</div><div class=\"settings-group\"><h3>Aufgaben an den Co-Trainer "
"abgeben</h3><p class=\"settings-group-help\">Die fünf "
"Automatikfunktionen des Originals. Änderungen werden erst mit "
"„Anwenden“ übernommen.</p>";
for (const auto &o : settings_catalogue().at("automation")) {
const auto key = o[0].get<std::string>();
pane += settings_row("automation-" + key, o[1].get<std::string>(),
o[2].get<std::string>(),
settings_switch("automation-" + key, "automation",
key, a.at(key).get<bool>()));
}
pane += "</div>";
} else {
std::vector<std::pair<std::string, std::string>> groups;
for (const auto &g : settings_catalogue().at("groups"))
groups.emplace_back(g.at("id").get<std::string>(),
g.at("title").get<std::string>());
head += "<div class=\"settings-jump-label\"><span>Zum Abschnitt</span>" +
settings_select("settings-jump", groups, settings_jump_, "jump", "",
"") +
"</div>";
pane = "<div id=\"settings-groups\">" + render_settings_groups() + "</div>";
}
const std::string search =
settings_category_ == "game"
? "<div class=\"settings-searchbar\"><div "
"class=\"settings-search-field\">" +
glyph("search", 30) +
"<input type=\"text\" id=\"settings-search\" maxlength=\"120\" "
"value=\"" +
esc(settings_query_) +
"\" placeholder=\"Spieloption suchen …\"/>" +
btn("settings-search-clear", "×", "",
"id=\"settings-search-clear\" aria-label=\"Suche "
"leeren\"") +
"</div><span id=\"settings-search-count\"></span></div>"
: "";
settings_restore_scroll_ = true;
return "<section class=\"settings-layout\"><nav "
"class=\"settings-categories\" role=\"tablist\" "
"aria-orientation=\"vertical\">" +
nav + "</nav><div class=\"settings-pane\" data-category=\"" +
settings_category_ + "\"><header class=\"settings-pane-header\">" +
head + "</header>" + search +
"<div id=\"settings-options\" class=\"settings-scroll\" "
"tabindex=\"0\">" +
pane +
"</div></div></section><div class=\"settings-actions\"><p "
"id=\"settings-draft-status\"></p>" +
btn("settings-cancel", "Abbrechen", "", "id=\"settings-cancel\"") +
btn("settings-apply", "Anwenden", "", "id=\"settings-apply\"") +
"</div>";
}
+37
View File
@@ -0,0 +1,37 @@
// SPDX-License-Identifier: GPL-3.0-only
Json ui_preferences_ = default_ui_preferences();
bool ui_preferences_loaded_ = false;
std::string ui_preferences_error_;
std::string settings_category_ = "display", settings_query_,
settings_jump_ = "rules", settings_notice_,
settings_rendered_category_;
Json settings_draft_, settings_base_, settings_scrolls_ = Json::object();
uint64_t settings_revision_ = 0;
std::shared_ptr<const Catalog> settings_world_;
const DataSource *settings_source_ = nullptr;
bool settings_restore_scroll_ = false;
fs::path ui_preferences_file() const;
void reset_settings();
void begin_settings();
bool settings_global_only() const;
bool settings_dirty() const;
bool settings_valid() const;
std::string render_settings_groups(int *count = nullptr) const;
std::string settings_row(const std::string &, const std::string &,
const std::string &, const std::string &) const;
std::string settings_switch(const std::string &, const std::string &,
const std::string &, bool, bool = false) const;
std::string settings_option(const Json &) const;
std::string
settings_select(const std::string &,
const std::vector<std::pair<std::string, std::string>> &,
const std::string &, const std::string &, const std::string &,
const std::string &) const;
bool settings_action(const std::string &, Rml::Element *);
bool settings_event(Rml::Event &);
bool settings_change(Rml::Element *);
void settings_filter();
void settings_sync();
void settings_remember_scroll();
void settings_after_render();
void settings_commit();
+87
View File
@@ -0,0 +1,87 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/ui_preferences.hpp"
#include <set>
namespace bmh::modern_ui {
namespace {
bool keys(const Json &v, std::initializer_list<const char *> names) {
if (!v.is_object() || v.size() != names.size())
return false;
for (const auto *n : names)
if (!v.contains(n))
return false;
return true;
}
bool choice(const Json &v, std::initializer_list<const char *> names) {
if (!v.is_string())
return false;
for (const auto *n : names)
if (v == n)
return true;
return false;
}
} // namespace
Json default_ui_preferences() {
return {{"theme", "midnight"},
{"display",
{{"mode", "window"},
{"resolution", "1920x1080"},
{"scale", "auto"},
{"language", "de"}}},
{"sound", {{"volume", 80}, {"effects", true}, {"style", "classic"}}}};
}
bool valid_ui_preferences(const Json &v) {
try {
if (!keys(v, {"theme", "display", "sound"}) ||
!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"}) &&
keys(s, {"volume", "effects", "style"}) &&
choice(d.at("mode"), {"window", "fullscreen"}) &&
choice(d.at("resolution"), {"1280x720", "1600x900", "1920x1080",
"2560x1440", "3840x2160"}) &&
choice(d.at("scale"), {"auto", "1", "1.5", "2"}) &&
d.at("language") == "de" && s.at("volume").is_number_integer() &&
s.at("volume") >= 0 && s.at("volume") <= 100 &&
s.at("effects").is_boolean() &&
choice(s.at("style"), {"classic", "modern"});
} catch (const Json::exception &) {
return false;
}
}
Json legacy_ui_preferences(const Json &legacy) {
auto next = default_ui_preferences();
if (!legacy.is_object())
return next;
if (legacy.contains("theme"))
next["theme"] = legacy["theme"];
for (const auto *key : {"mode", "resolution", "scale"})
if (legacy.contains(key))
next["display"][key] = legacy[key];
for (const auto *key : {"volume", "effects"})
if (legacy.contains(key))
next["sound"][key] = legacy[key];
if (legacy.contains("sound-style"))
next["sound"]["style"] = legacy["sound-style"];
return valid_ui_preferences(next) ? next : default_ui_preferences();
}
Json load_ui_preferences(const fs::path &path) {
if (!fs::exists(path))
return default_ui_preferences();
const auto envelope = Json::parse(editor::read_file(path));
if (!keys(envelope, {"schema", "preferences"}) ||
envelope.at("schema") != "openbmh-ui-preferences@1" ||
!valid_ui_preferences(envelope.at("preferences")))
throw editor::Error("invalid_ui_preferences");
return envelope.at("preferences");
}
void save_ui_preferences(const fs::path &path, const Json &v) {
if (!valid_ui_preferences(v))
throw editor::Error("invalid_ui_preferences");
if (!path.parent_path().empty())
fs::create_directories(path.parent_path());
editor::write_atomic(
path,
Json{{"schema", "openbmh-ui-preferences@1"}, {"preferences", v}}.dump(2));
}
} // namespace bmh::modern_ui
+12
View File
@@ -0,0 +1,12 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "modern/ui/catalog.hpp"
namespace bmh::modern_ui {
Json default_ui_preferences();
bool valid_ui_preferences(const Json &);
Json legacy_ui_preferences(const Json &);
// A missing file is a normal first launch. Malformed files are reported and
// left intact; callers decide how to present the error without hiding it.
Json load_ui_preferences(const fs::path &);
void save_ui_preferences(const fs::path &, const Json &);
} // namespace bmh::modern_ui
+26 -11
View File
@@ -19,6 +19,8 @@
#include "modern/ui/demo_stadium.hpp"
#include "modern/ui/demo_statistics.hpp"
#include "modern/ui/demo_news.hpp"
#include "modern/ui/demo_settings.hpp"
#include "modern/ui/ui_preferences.hpp"
#include "modern/ui/desktop.hpp"
#include "modern/ui/gui_assets.hpp"
#include "modern/ui/model.hpp"
@@ -408,8 +410,7 @@ class App final : public Rml::EventListener {
int last_tactic_ = 0;
bool draw_playing_ = true;
uint64_t draw_at_ = 0;
std::string settings_category_ = "display";
Json draft_preferences_;
#include "modern/ui/settings_state.inc"
std::map<std::string, std::string> selections_;
Rml::Element *element(const std::string &id) const {
return doc_->GetElementById(id);
@@ -585,6 +586,7 @@ class App final : public Rml::EventListener {
return nullptr;
}
void load_world(const fs::path &file) {
reset_settings();
auto next = Catalog::open(file);
auto demo = std::make_unique<DemoSource>(next);
ticket_.reset();
@@ -807,7 +809,7 @@ class App final : public Rml::EventListener {
pending_selects_.erase(id);
if (auto *select = element(id)) {
// Menu-local select handlers receive only a committed/cancelled value.
if ((menu_ == "lineup" && id.starts_with("lineup-")) ||
if (menu_ == "settings" || (menu_ == "lineup" && id.starts_with("lineup-")) ||
(menu_ == "transfer" && id.starts_with("transfer-")))
select->DispatchEvent("change", {});
else change(select);
@@ -853,6 +855,7 @@ class App final : public Rml::EventListener {
// A window-close save prompt can leave a menu while its local dialog is
// open. Never keep that menu's modal/input gate in the destination view.
if (menu_ != last_rendered_menu_) {
if(last_rendered_menu_=="settings")reset_settings();
statistics_trophy_ = Json::object();
planning_dialog_.clear();
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
@@ -1072,6 +1075,7 @@ class App final : public Rml::EventListener {
if (menu_ == "transfer") transfer_restore_scroll();
if (menu_ == "scorers" || menu_ == "fairplay") rankings_restore_scroll();
if (menu_ == "statistics") statistics_restore_scroll();
if (menu_ == "settings") settings_after_render();
if (!report_option_to_scroll_.empty()) {
if (auto *node = element(report_option_to_scroll_))
node->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
@@ -1223,8 +1227,15 @@ public:
"mouseup", "mousemove", "contextmenu", "focus"})
doc_->AddEventListener(event, this, Rml::String(event) == "keydown" ||
Rml::String(event) == "blur" || Rml::String(event) == "focus");
if (!config_.theme.empty())
theme_ = config_.theme;
try {
ui_preferences_loaded_=fs::exists(ui_preferences_file());
ui_preferences_=load_ui_preferences(ui_preferences_file());
} catch(const std::exception &) {
ui_preferences_error_="Die gespeicherten UI-Einstellungen konnten nicht geladen werden. Die Standardwerte werden verwendet.";
ui_preferences_=default_ui_preferences();ui_preferences_loaded_=false;
}
theme_=ui_preferences_.at("theme").get<std::string>();
if (!config_.theme.empty()) theme_ = config_.theme;
if (theme_ != "midnight" && theme_ != "silver" && theme_ != "matchday")
throw editor::Error("Unbekanntes Modern-Theme.");
collect_mods();
@@ -1243,19 +1254,21 @@ public:
if (!config_.state.empty() && source_) {
desktop_ = source_->load(config_.state);
saved_desktop_ = desktop_;
if (config_.theme.empty())
theme_ = snap().state.at("preferences").value("theme", theme_);
if (config_.theme.empty() && !ui_preferences_loaded_) {
ui_preferences_=legacy_ui_preferences(snap().state.at("preferences"));
theme_=ui_preferences_.at("theme").get<std::string>();
}
}
if (source_ && !config_.theme.empty()) {
auto preferences = snap().state.at("preferences");
preferences["theme"] = theme_;
apply("preferences", preferences);
if (!config_.theme.empty()) {
// A capture/CLI override is visual only and never edits a career.
ui_preferences_["theme"]=theme_;
}
if (scene_ == "manager" && selections_["manager-name"].empty())
selections_["manager-name"] = "Alex Berger";
doc_->Show();
resize();
render();
if (!ui_preferences_error_.empty()) message(ui_preferences_error_);
SDL_ShowWindow(video_.window);
frame();
} catch (...) {
@@ -1381,6 +1394,8 @@ public:
#include "modern/ui/statistics_controls.inc"
#include "modern/ui/news_screens.inc"
#include "modern/ui/news_controls.inc"
#include "modern/ui/settings_screens.inc"
#include "modern/ui/settings_controls.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
+1 -1
View File
@@ -4,7 +4,7 @@
namespace bmh::modern_ui {
struct Config {
std::filesystem::path world, gui_assets, screenshot, commands, state;
std::filesystem::path world, gui_assets, screenshot, commands, state, preferences;
std::string scene = "main", theme;
int width = 1280, height = 720;
};
+10 -3
View File
@@ -113,7 +113,7 @@ int main(int argc, char **argv) try {
std::ostringstream css;
for (const auto *name : {"theme.rcss", "ticket.rcss", "sports.rcss",
"calendar.rcss", "reports.rcss", "report_details.rcss",
"report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss", "finance.rcss", "bank.rcss", "contracts.rcss", "amount.rcss", "environment.rcss", "advertising.rcss", "toto.rcss", "lineup.rcss", "transfer.rcss", "career_reports.rcss", "rankings.rcss", "stadium.rcss", "statistics.rcss", "news.rcss"}) {
"report_pickers.rcss", "indoor.rcss", "planning.rcss", "almanac.rcss", "finance.rcss", "bank.rcss", "contracts.rcss", "amount.rcss", "environment.rcss", "advertising.rcss", "toto.rcss", "lineup.rcss", "transfer.rcss", "career_reports.rcss", "rankings.rcss", "stadium.rcss", "statistics.rcss", "news.rcss", "settings.rcss"}) {
std::ifstream input(root / name);
require(bool(input), "Production stylesheet missing");
css << input.rdbuf() << '\n';
@@ -181,6 +181,13 @@ int main(int argc, char **argv) try {
select("manager-strength") + "</div><div class='bottom-controls'>" +
button_markup("continue", "Continue", {}, "id='footer'") +
select("tall") + "</div></div>";
content += "<div style='position:absolute;left:2700dp;top:800dp;width:1100dp;'>"
"<div class='settings-row'><label><span id='settings-row-label'>Automatische Aufstellung</span>"
"<small id='settings-row-help'>Aufgaben an den Co-Trainer abgeben.</small></label>"
"<select id='settings-control' class='settings-select'><option selected>1920 × 1080</option>"
"<option>3840 × 2160</option></select></div>"
"<div class='settings-jump-label'><select id='settings-jump-test' class='settings-select'>"
"<option selected>Spielablauf und Wettbewerbe</option><option>Ergebnisse</option></select></div></div>";
auto *doc = context->LoadDocumentFromMemory(
"<rml><head><style>" + css.str() + "</style></head><body class='" +
theme + "'>" + content + "</body></rml>");
@@ -196,7 +203,7 @@ int main(int argc, char **argv) try {
context->Render();
}
require(!center_selects(*doc), "Control centering does not settle");
for (const auto *id : {"stats-scale-label", "stats-legend-label", "stats-player-label", "stats-world-label", "stats-from-label", "stats-winner-label", "news-brand-test"}) {
for (const auto *id : {"stats-scale-label", "stats-legend-label", "stats-player-label", "stats-world-label", "stats-from-label", "stats-winner-label", "news-brand-test", "settings-row-label", "settings-row-help"}) {
auto *label = doc->GetElementById(id);
require(label && label->GetBox().GetSize(Rml::BoxArea::Content).x > 0 && visible_text_lines(*label) > 0,
"A production statistics/news label has collapsed or lost its font face");
@@ -215,7 +222,7 @@ int main(int argc, char **argv) try {
rich->QuerySelector(".picture")->GetAbsoluteOffset().y,
"Rich card stacking changed");
for (const auto *id :
{"natural", "toolbar", "tall", "manager-strength"}) {
{"natural", "toolbar", "tall", "manager-strength", "settings-control", "settings-jump-test"}) {
auto *control = doc->GetElementById(id);
auto *caption = select_part(*control, "selectvalue"),
*arrow = select_part(*control, "selectarrow");
+275
View File
@@ -0,0 +1,275 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/demo_settings.hpp"
#include "modern/ui/desktop.hpp"
#include "modern/ui/model.hpp"
#include "modern/ui/ui_preferences.hpp"
#include <chrono>
#include <iostream>
#include <set>
#include <stdexcept>
using namespace bmh::modern_ui;
namespace {
void require(bool yes, const char *why) {
if (!yes)
throw std::runtime_error(why);
}
struct Fixture {
fs::path root;
std::shared_ptr<const Catalog> world;
Fixture() {
root = fs::temp_directory_path() /
("openbmh-settings-ui-" +
std::to_string(
std::chrono::steady_clock::now().time_since_epoch().count()));
fs::create_directories(root / "world");
const auto write = [&](const std::string &name, const Json &data) {
bmh::editor::write_atomic(root / name, data.dump());
};
write("manifest.json", {{"format", "openbmh-world"},
{"kind", "world"},
{"format_version", "1.1"},
{"id", "world:synthetic-settings"},
{"start_date", "2032-07-01"},
{"requires", {"editor:world-v1"}},
{"x-editor", {{"profile", "editor-world-v1"}}}});
write("world/nations.json",
{{"items", {{{"id", "nation:de"}, {"name", "Synthetic nation"}}}}});
write("world/competitions.json", {{"items",
{{{"id", "competition:settings-test"},
{"type", "league"},
{"nation", "nation:de"},
{"name", "Synthetic league"}}}}});
Json clubs = Json::array();
for (int i = 0; i < 2; ++i)
clubs.push_back({{"id", "club:settings-" + std::to_string(i)},
{"name", "Synthetic Club " + std::to_string(i)},
{"nation", "nation:de"},
{"competition", "competition:settings-test"}});
write("world/clubs.json", {{"items", clubs}});
write("world/players.json", {{"items", Json::array()}});
world = Catalog::open(root);
}
~Fixture() {
std::error_code ec;
fs::remove_all(root, ec);
}
};
void provider() {
Json state = {
{"training", {{"autos", {false, true, false, true}}, {"kept", 41}}},
{"other", 123}};
require(migrate_demo_settings(state) && valid_demo_settings(state),
"Migration failed");
const auto initial = state;
require(migrate_demo_settings(state) && state == initial,
"Migration was not idempotent");
std::set<std::string> codes;
std::vector<Json> options;
for (const auto &g : settings_catalogue().at("groups")) {
if (g.contains("options"))
for (const auto &o : g.at("options"))
options.push_back(o);
else
for (const auto &c : g.at("competitions"))
for (const auto &o : c.at("options"))
options.push_back(o);
}
require(options.size() == 142 &&
settings_catalogue().at("groups").size() == 10,
"Game catalogue incomplete");
for (const auto &o : settings_catalogue().at("sound"))
options.push_back(o);
for (const auto &o : options) {
const auto code = o.at("code").get<std::string>();
require(settings_index(code) >= 0 && codes.insert(code).second,
"Invalid or duplicate option code");
}
require(codes.size() == 145 &&
settings_catalogue().at("automation").size() == 5,
"Visible catalogue incomplete");
require(settings_index("A1") == 0 && settings_index("T9") == 179 &&
settings_index("Z1") == -1,
"Code mapping incorrect");
require(settings_search_key("GROẞEN ÄÖÜ") == "grossen aou",
"German search folding failed");
auto next = state.at("settings");
next["cells"][settings_index("A9")] = 99;
next["cells"][settings_index("G8")] = 3;
next["automation"]["training"] = true;
require(edit_demo_settings(state, next).empty() &&
state.at("training").at("autos") ==
Json({true, true, true, true}) &&
state.at("training").at("kept") == 41,
"Automation or numeric commit failed");
auto preserved = state.at("settings").at("cells");
preserved[settings_index("A9")] = 0;
preserved[settings_index("G8")] = 1;
require(preserved == initial.at("settings").at("cells"),
"Commit changed reserved cells");
state["training"]["autos"][0] = false;
sync_demo_settings_training(state);
require(valid_demo_settings(state) &&
state.at("settings").at("automation").at("training") == false,
"Training aggregate not synchronized");
const auto before = state;
std::vector<Json> invalid;
for (const auto &value : std::vector<Json>{-1, 100, 1.5, nullptr, "2"}) {
auto bad = next;
bad["cells"][8] = value;
invalid.push_back(bad);
}
auto bad = next;
bad["cells"][settings_index("G8")] = 4;
invalid.push_back(bad);
bad = next;
bad["cells"][0] = 2;
invalid.push_back(bad);
bad = next;
bad["version"] = 1.0;
invalid.push_back(bad);
bad = next;
bad["automation"]["training"] = 1;
invalid.push_back(bad);
bad = next;
bad["unexpected"] = true;
invalid.push_back(bad);
bad = next;
bad["cells"].erase(0);
invalid.push_back(bad);
for (const auto &value : invalid) {
require(!edit_demo_settings(state, value).empty() && state == before,
"Invalid action mutated state");
auto imported = state;
imported["settings"] = value;
const auto original = imported;
require(!migrate_demo_settings(imported) && imported == original,
"Malformed block silently repaired");
}
}
void preferences(Fixture &f) {
const auto path = f.root / "userdata" / "prefs.json";
const auto defaults = default_ui_preferences();
require(valid_ui_preferences(defaults) &&
load_ui_preferences(path) == defaults && !fs::exists(path),
"Missing global preferences not read-only");
auto p = defaults;
p["theme"] = "silver";
p["sound"]["volume"] = 0;
p["display"]["resolution"] = "3840x2160";
save_ui_preferences(path, p);
require(load_ui_preferences(path) == p, "Global persistence failed");
const auto original = bmh::editor::read_file(path);
for (const auto &[key, value] :
std::vector<std::pair<std::string, Json>>{{"volume", 101},
{"volume", -1},
{"volume", 2.5},
{"effects", 1},
{"style", "bad"}}) {
auto bad = p;
bad["sound"][key] = value;
bool rejected = false;
try {
save_ui_preferences(path, bad);
} catch (const std::exception &) {
rejected = true;
}
require(rejected && bmh::editor::read_file(path) == original,
"Invalid global preferences overwritten file");
}
auto bad = p;
bad["display"]["language"] = "en";
require(!valid_ui_preferences(bad), "Untranslated language enabled");
bad = p;
bad["display"]["scale"] = "3";
require(!valid_ui_preferences(bad), "Unknown scale accepted");
bad = p;
bad["display"]["mode"] = "borderless";
require(!valid_ui_preferences(bad), "Unknown display mode accepted");
bad = p;
bad["extra"] = 1;
require(!valid_ui_preferences(bad), "Unknown global key accepted");
const auto legacy = legacy_ui_preferences(
{{"theme", "matchday"}, {"volume", 25}, {"sound-style", "modern"}});
require(legacy.at("theme") == "matchday" &&
legacy.at("sound").at("volume") == 25 &&
valid_ui_preferences(legacy),
"Legacy checkpoint migration failed");
bmh::editor::write_atomic(path, "{corrupted");
bool rejected = false;
try {
load_ui_preferences(path);
} catch (const std::exception &) {
rejected = true;
}
require(rejected && bmh::editor::read_file(path) == "{corrupted",
"Corrupt preferences silently overwritten");
}
void source(Fixture &f) {
DemoSource source(f.world);
const auto initial = source.snapshot();
require(valid_demo_settings(initial.state) && !source.dirty(),
"Initial source invalid or dirty");
auto value = initial.state.at("settings");
value["automation"]["training"] = true;
require(source.apply({initial.revision, "settings", value}).ok,
"Source settings commit failed");
const auto applied = source.snapshot();
require(applied.revision == initial.revision + 1 && source.dirty(),
"Source commit revision incorrect");
require(!source.apply({initial.revision, "settings",
initial.state.at("settings")})
.ok &&
source.snapshot().state == applied.state,
"Stale settings action accepted");
const auto file = f.root / "checkpoint.json";
source.save(file, default_desktop());
source.load(file);
require(source.snapshot().state.at("settings") == value && !source.dirty(),
"Checkpoint round trip failed");
auto data = Json::parse(bmh::editor::read_file(file));
data.erase("settings");
bmh::editor::write_atomic(file, data.dump());
source.load(file);
require(valid_demo_settings(source.snapshot().state) &&
source.snapshot()
.state.at("settings")
.at("automation")
.at("training") == true &&
!source.dirty(),
"Old checkpoint migration lost training aggregate");
source.save(file, default_desktop());
data = Json::parse(bmh::editor::read_file(file));
data["settings"]["cells"][0] = 9;
bmh::editor::write_atomic(file, data.dump());
const auto before = source.snapshot();
bool rejected = false;
try {
source.load(file);
} catch (const std::exception &) {
rejected = true;
}
require(rejected && source.snapshot().state == before.state &&
source.snapshot().revision == before.revision && !source.dirty(),
"Malformed load was not atomic");
auto unrelated = applied.state;
unrelated.erase("settings");
unrelated.erase("training");
auto old = initial.state;
old.erase("settings");
old.erase("training");
require(unrelated == old, "Settings modified unrelated presentation fields");
}
} // namespace
int main() {
try {
Fixture f;
provider();
preferences(f);
source(f);
std::cout << "modern settings UI tests passed\n";
return 0;
} catch (const std::exception &e) {
std::cerr << e.what() << '\n';
return 1;
}
}
+2
View File
@@ -553,6 +553,8 @@ int main(int argc, char **argv) try {
require(restored_sports.snapshot().state == sports.snapshot().state,
"Training/tactics were lost on restoration");
auto legacy = Json::parse(bmh::editor::read_file(root / "sports.ui.json"));
// A checkpoint predating training also predates the aggregate settings block.
legacy.erase("settings");
legacy.erase("training");
legacy.erase("tactics");
legacy.erase("calendar");