diff --git a/assets/modern/art/entry-club.png b/assets/modern/art/entry-club.png new file mode 100644 index 0000000..9c279f3 Binary files /dev/null and b/assets/modern/art/entry-club.png differ diff --git a/assets/modern/art/entry-draw.png b/assets/modern/art/entry-draw.png new file mode 100644 index 0000000..a8aa3c4 Binary files /dev/null and b/assets/modern/art/entry-draw.png differ diff --git a/assets/modern/art/entry-international.png b/assets/modern/art/entry-international.png new file mode 100644 index 0000000..ee1683f Binary files /dev/null and b/assets/modern/art/entry-international.png differ diff --git a/assets/modern/art/entry-table.png b/assets/modern/art/entry-table.png new file mode 100644 index 0000000..7c3d4f2 Binary files /dev/null and b/assets/modern/art/entry-table.png differ diff --git a/assets/modern/art/gui-assets.json b/assets/modern/art/gui-assets.json index 1f37240..3d9da28 100644 --- a/assets/modern/art/gui-assets.json +++ b/assets/modern/art/gui-assets.json @@ -301,6 +301,46 @@ 1, 1 ] + }, + "entry.table": { + "file": "entry-table.png", + "sha256": "a2e38dc9233af4516fb08607af2191a142ff49f785e6852fc97bf3afcf7ccacb", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "entry.club": { + "file": "entry-club.png", + "sha256": "edcac6345c07bfb98e4d23851a2f69c91920f6df4f6fb83706ab15542c08fe2b", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "entry.international": { + "file": "entry-international.png", + "sha256": "e0cea088f29ebf392da363e4130445e2199c0eecb98d5f8051dd621922ad5fb9", + "crop": [ + 0, + 0, + 1, + 1 + ] + }, + "entry.draw": { + "file": "entry-draw.png", + "sha256": "66767efc37a0fde3a1297f854353af7e0cbf439c58a12fe238b48147eeac7c45", + "crop": [ + 0, + 0, + 1, + 1 + ] } } } diff --git a/assets/modern/notebook.rcss b/assets/modern/notebook.rcss index 4d9b3a1..c645d65 100644 --- a/assets/modern/notebook.rcss +++ b/assets/modern/notebook.rcss @@ -319,3 +319,6 @@ body.midnight .hw-item,body.matchday .hw-item {background-color:#ffffff14;} body .nb-whistle,.nb-whistle:hover,.nb-whistle:disabled {left:3298.5dp;top:1845dp;width:1012.5dp;height:589.5dp;transform-origin:355.5dp 184.5dp;transform:rotate(115deg) scale(0.64);} .nb-whistle:hover {transform:rotate(108deg) scale(0.7);filter:brightness(1.07);} .nb-whistle-art {width:1012.5dp;height:589.5dp;} +/* the ribbon is a button: back to the main menu */ +.nb-ribbon,.nb-ribbon:hover,.nb-ribbon:focus {display:block;padding:0;margin:0;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;} +.nb-ribbon:hover {top:2014dp;} diff --git a/assets/modern/pages.rcss b/assets/modern/pages.rcss index d05a241..f01172a 100644 --- a/assets/modern/pages.rcss +++ b/assets/modern/pages.rcss @@ -840,3 +840,193 @@ body.midnight .cp-map-name,body.matchday .cp-map-name {color:#f0ece2;font-effect .bk-move.flat {color:var(--p-n7);font-weight:normal;} .ad-memo.bk-rates strong {font-size:62dp;line-height:72dp;} .ad-memo.bk-rates span {font-size:50dp;line-height:66dp;} + +/* --- the entry into the game: main menu, settings of a new game, managers, clubs, the season's + opening. Everything is written on one pad that lies in the middle of a table (the picture + entry.table, 1672 x 941 design units; 1 unit = 2.29665 dp). The pad is always paper, whatever + the skin of the career. --- */ +.es-stage {position:absolute;left:0;top:0;width:3840dp;height:2161.15dp;overflow:hidden;background-color:#3a2414; + --p-bg:#f5ead8;--p-surf:#ebddc5;--p-text:#201e1d;--p-div:#201e1d29;--p-shade:#2e2b2557; + --p-n1:#f9f4ed;--p-n2:#eee7db;--p-n3:#dcd3c4;--p-n4:#c0b6a5;--p-n5:#a19786;--p-n6:#82796a;--p-n7:#645c50;--p-n8:#474238;--p-n9:#2e2b25; + --p-a1:#fff2eb;--p-a2:#ffe1d0;--p-a3:#ffc6a5;--p-a4:#f6a06b;--p-a5:#d67f48;--p-a6:#b2622d;--p-a7:#8c491a;--p-a8:#643312;--p-a9:#402310; + --p-s1:#f0fae1;--p-s2:#e1eecc;--p-s3:#ccdbb2;--p-s4:#aebf92;--p-s5:#8fa073;--p-s6:#728157;--p-s7:#56633f;--p-s8:#3d472b;--p-s9:#272e1b; + --p-accent:#c67139;--p-on-accent:#f9f4ed;--p-row:#201e1d0a;--p-rule:#201e1d17; + --text:#2a211a;--muted:#645c50;--border:#2a211a4d;--accent:#8c491a;--input:#fffdf6;--strong:#fffdf6;--selected:#ffe1d0;--hover:#f9f4ed;--soft:#f9f4ed;} +.es-table {position:absolute;left:0;top:0;width:3840dp;height:2161.15dp;} +.es-paper {position:absolute;left:996.75dp;top:454.74dp;width:1841.91dp;height:1276.94dp;display:flex;flex-direction:column;gap:22.97dp;font-family:Modern;font-size:31dp;line-height:41.34dp;color:#2a211a;} +.es-under {display:flex;flex:1;flex-direction:column;gap:22.97dp;min-height:0;min-width:0;} +.es-head {display:flex;flex:none;align-items:flex-end;gap:22.97dp;} +.es-clip {display:block;flex:none;width:137.8dp;height:9.19dp;} +.es-grow {display:block;flex:1;min-width:0;} +.es-k {display:block;font-size:24.11dp;line-height:32.15dp;letter-spacing:3.22dp;font-weight:bold;color:#8c491a;white-space:nowrap;} +.es-h1 {display:block;margin:0;font-family:Display;font-weight:normal;font-size:73.49dp;line-height:82.68dp;white-space:nowrap;color:#2a211a;} +.es-h {display:block;margin:0;font-family:Display;font-weight:normal;color:#2a211a;} +.es-rule {display:block;flex:none;height:3.44dp;background-color:#8c491a59;} +.es-foot {display:flex;flex:none;justify-content:flex-end;align-items:center;gap:18.37dp;height:82.68dp;padding-right:160.77dp;} +.es-foot .es-note {display:block;flex:1;font-size:27.56dp;color:#645c50;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-fill {display:flex;flex:1;min-height:0;min-width:0;} +.es-row {display:flex;align-items:center;gap:22.97dp;min-width:0;} +.es-col {display:flex;flex-direction:column;min-width:0;min-height:0;} +.es-mut {color:#645c50;} +.es-box {display:block;border:3.44dp #2a211a33;border-radius:32.15dp;background-color:#fffdf680;padding:22.97dp 27.56dp;min-width:0;} +.es-box.es-row,.es-box.es-col {display:flex;} +.es-paper .pg-btn,.es-veil .pg-btn {height:78.09dp;padding:0 41.34dp;border-radius:39.04dp;font-size:34.45dp;line-height:45.93dp;} +.es-paper .pg-btn.sm,.es-veil .pg-btn.sm {height:64.31dp;padding:0 29.86dp;font-size:29.86dp;} +.es-paper .pg-tabs {gap:13.78dp;} +.es-paper .pg-tabs button,.es-paper .pg-tabs button:disabled {height:68.9dp;line-height:68.9dp;padding:0 36.75dp;border-radius:34.45dp;font-size:32.15dp;} + +/* the main menu */ +.es-title {display:block;flex:none;margin:0;padding-top:9.19dp;font-family:Display;font-weight:normal;font-size:114.83dp;line-height:128.61dp;white-space:nowrap;color:#2a211a;} +.es-gold {display:block;flex:none;width:252.63dp;height:11.48dp;border-radius:6.89dp;background-color:#d9a441;margin:-4.59dp 0 4.59dp;} +.es-menu {display:flex;flex:none;flex-direction:column;width:918.66dp;} +.es-stage .es-mb,.es-stage .es-mb:hover,.es-stage .es-mb:focus,.es-stage .es-mb:disabled {display:flex;flex:none;align-items:center;width:918.66dp;height:114.83dp;padding:0 32.15dp 0 45.93dp;margin:0;border:0dp;border-bottom:3.44dp #2a211a4d;border-radius:0dp;background-color:transparent;decorator:none;box-shadow:none;font-family:Display;font-weight:normal;font-size:52.82dp;letter-spacing:0dp;color:#2a211a;text-align:left;opacity:1;} +.es-stage .es-mb.gap {margin-top:32.15dp;border-top:3.44dp #2a211a4d;} +.es-stage .es-mb:hover,.es-stage .es-mb:focus-visible {background-color:#d9a44129;border-left:13.78dp #d9a441;padding-left:45.93dp;} +.es-stage .es-mb span {display:block;white-space:nowrap;} +.es-stage .es-mb .es-mb-s {margin-left:22.97dp;font-family:Modern;font-size:24.11dp;letter-spacing:2.76dp;color:#2a211a80;} +.es-stage .es-mb .es-mb-a {font-size:64.31dp;color:#b2622d;opacity:0;} +.es-stage .es-mb:hover .es-mb-a,.es-stage .es-mb:focus-visible .es-mb-a {opacity:1;} +.es-stage .es-mb[disabled],.es-stage .es-mb[disabled]:hover {color:#2a211a6b;background-color:transparent;border-left-width:0dp;padding-left:45.93dp;} +.es-stage .es-mb[disabled] .es-mb-a {opacity:0;} +.es-side {display:flex;flex:1;flex-direction:column;justify-content:flex-end;gap:11.48dp;padding:0 160.77dp 13.78dp 0;text-align:right;} +.es-side span,.es-side strong {display:block;} +.es-side strong {font-size:34.45dp;line-height:45.93dp;} +.es-ask {text-align:left;} +.es-ask strong {font-family:Display;font-weight:normal;font-size:41.34dp;line-height:55.12dp;} + +/* the settings of a new game */ +.es-stage .es-step,.es-stage .es-step:hover,.es-stage .es-step:focus,.es-stage .es-step:disabled {display:flex;flex:none;align-items:center;justify-content:center;width:87.27dp;height:87.27dp;padding:0;margin:0;border:3.44dp #2a211a4d;border-radius:43.64dp;background-color:#fffdf699;decorator:none;font-family:Display;font-size:50.53dp;line-height:59.71dp;color:#2a211a;opacity:1;} +.es-stage .es-step:hover {background-color:#ffe1d0;border-color:#b2622d;} +.es-stage .es-step[disabled],.es-stage .es-step[disabled]:hover {opacity:.3;background-color:#fffdf699;border-color:#2a211a4d;} +.es-opt {position:relative;display:flex;flex:1;align-items:center;gap:13.78dp;padding:55.12dp 27.56dp 18.37dp;min-height:0;} +.es-opt-k {position:absolute;left:32.15dp;top:20.67dp;} +.es-opt-v {display:flex;flex:1;flex-direction:column;align-items:center;justify-content:center;min-width:0;} +.es-num {display:block;font-family:Display;font-size:174.55dp;line-height:174.55dp;color:#2a211a;} +.es-num.inf {font-size:220.48dp;line-height:160.77dp;} +.es-cap {display:block;font-size:27.56dp;line-height:36.75dp;color:#645c50;white-space:nowrap;} +.es-balls {display:flex;flex-wrap:wrap;justify-content:center;gap:6.89dp;width:493.78dp;margin-bottom:6.89dp;} +.es-ball {display:block;flex:none;width:87.27dp;height:87.27dp;} +.es-faces {display:flex;justify-content:center;gap:16.08dp;margin-bottom:9.19dp;} +.es-face-dot {display:block;flex:none;width:142.39dp;height:142.39dp;border:4.59dp #2a211a;border-radius:75.79dp;overflow:hidden;} +.es-face-dot.near {margin-left:-27.56dp;} +.es-face-dot.first {margin-left:0dp;} +.es-stage .es-mode,.es-stage .es-mode:hover,.es-stage .es-mode:focus,.es-stage .es-mode:disabled {position:relative;display:flex;flex:1;flex-direction:column;align-items:center;padding:16.08dp 16.08dp 0;margin:0;border:0dp;border-radius:22.97dp;background-color:#fffdf6;decorator:none;overflow:hidden;transform:rotate(-1.2deg);text-align:center;opacity:1;} +.es-stage .es-mode.b,.es-stage .es-mode.b:hover,.es-stage .es-mode.b:disabled {transform:rotate(1deg);} +.es-stage .es-mode.off,.es-stage .es-mode.off:hover {opacity:.55;background-color:#e6ddcd;} +.es-stage .es-mode-art {display:block;flex:none;overflow:hidden;border-radius:9.19dp;} +.es-stage .es-mode strong {display:block;padding:13.78dp 0 16.08dp;font-family:Display;font-weight:normal;font-size:36.75dp;line-height:45.93dp;color:#2a211a;white-space:nowrap;} +.es-check {position:absolute;right:29.86dp;top:29.86dp;display:flex;align-items:center;justify-content:center;width:68.9dp;height:68.9dp;border:4.59dp #2a211a;border-radius:34.45dp;background-color:#fffdf6;} +.es-check span {display:block;font-family:Modern;font-size:39.04dp;line-height:50.53dp;font-weight:bold;color:#2a211a;} +.es-stage .es-mode.on .es-check {background-color:#d9a441;border-color:#d9a441;} + +/* a new manager */ +.es-paper input.es-in {display:block;width:100%;height:82.68dp;padding:0 32.15dp;border:3.44dp #2a211a4d;border-radius:41.34dp;background-color:#fffdf6cc;decorator:none;font-family:Modern;font-size:34.45dp;line-height:75.79dp;color:#2a211a;} +.es-paper input.es-in:focus {border-color:#8c491a;} +.es-paper select {width:284.78dp;height:73.49dp;padding:0 45.93dp 0 22.97dp;border:3.44dp #2a211a4d;border-radius:36.75dp;background-color:#fffdf6cc;font-family:Modern;font-size:29.86dp;line-height:66.6dp;font-weight:bold;color:#2a211a;} +.es-paper select.wide {width:390.43dp;} +.es-paper select selectvalue {padding-right:13.78dp;height:66.6dp;line-height:66.6dp;overflow:hidden;white-space:nowrap;} +.es-paper select selectarrow {width:11.48dp;height:11.48dp;margin-right:-22.97dp;margin-top:22.97dp;border-bottom:3.44dp #645c50;border-right:3.44dp #645c50;} +.es-paper select selectbox {padding:9.19dp;border:3.44dp #2a211a4d;border-radius:22.97dp;background-color:#fffdf6;max-height:689dp;} +.es-paper select option {padding:9.19dp 22.97dp;min-height:41.34dp;font-size:29.86dp;font-weight:normal;color:#2a211a;} +.es-paper select option:hover,.es-paper select option:checked {background-color:#ffe1d0;} +.es-face {display:block;flex:none;overflow:hidden;border-radius:22.97dp;} +.es-face.small {border-radius:18.37dp;} +.es-stage .es-por,.es-stage .es-por:hover,.es-stage .es-por:focus,.es-stage .es-por:disabled {position:relative;display:block;flex:none;width:215.89dp;height:284.78dp;padding:0;margin:0;border:6.89dp transparent;border-radius:22.97dp;background-color:transparent;decorator:none;overflow:hidden;opacity:1;} +.es-stage .es-por:hover {border-color:#b2622d8c;} +.es-stage .es-por.sel,.es-stage .es-por.sel:hover {border-color:#b2622d;background-color:#d9a441;} +.es-stage .es-por[disabled],.es-stage .es-por[disabled]:hover {border-color:transparent;} +.es-stage .es-por[disabled] .es-face {opacity:.28;} +.es-stage .es-por-used {position:absolute;left:0;bottom:11.48dp;display:block;width:202.11dp;text-align:center;font-family:Modern;font-weight:bold;font-size:21.82dp;line-height:25.26dp;letter-spacing:1.84dp;color:#2a211a;} +.es-pors {display:flex;flex:1;flex-wrap:wrap;gap:9.19dp 11.48dp;align-content:center;justify-content:center;min-height:0;} +.es-slot {display:block;flex:none;width:62.01dp;height:82.68dp;border:3.44dp #2a211a59;border-radius:18.37dp;} +.es-seat {display:flex;flex:none;align-items:center;gap:16.08dp;min-width:0;} +.es-seat strong {display:block;font-size:28.71dp;line-height:34.45dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-seat span {display:block;font-size:25.26dp;line-height:32.15dp;color:#645c50;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-warn {color:#a8452f;} + +/* the clubs of a league */ +.es-grid {display:block;flex:1;min-height:0;overflow-y:auto;overflow-x:hidden;} +.es-grid-in {display:flex;flex-wrap:wrap;gap:18.37dp;padding:4.59dp;} +.es-stage .es-tile,.es-stage .es-tile:hover,.es-stage .es-tile:focus,.es-stage .es-tile:disabled {display:flex;flex:none;flex-direction:column;align-items:center;gap:9.19dp;width:344.5dp;padding:22.97dp 13.78dp 18.37dp;margin:0;border:4.59dp #2a211a24;border-radius:27.56dp;background-color:#fffdf699;decorator:none;text-align:center;font-family:Modern;font-size:28.71dp;color:#2a211a;opacity:1;} +.es-stage .es-tile:hover {border-color:#b2622d;background-color:#fffdf6;} +.es-stage .es-tile.sel,.es-stage .es-tile.sel:hover {border-color:#b2622d;background-color:#ffe1d0;} +.es-stage .es-tile[disabled],.es-stage .es-tile[disabled]:hover {opacity:.5;border-color:#2a211a24;background-color:#fffdf699;} +.es-stage .es-tile strong {display:block;width:307.75dp;font-size:28.71dp;line-height:34.45dp;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-stage .es-tile small {display:block;width:307.75dp;font-size:24.11dp;line-height:29.86dp;color:#645c50;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-stage .es-tile.sel small {color:#3d472b;font-weight:bold;} + +/* a note laid over the pad */ +.es-veil {position:absolute;left:964.59dp;top:422.58dp;width:1906.22dp;height:1341.24dp;z-index:50;display:flex;align-items:center;justify-content:center;border-radius:41.34dp;background-color:#f5ead8d1;} +.es-dlg {display:flex;flex-direction:column;gap:27.56dp;width:1148.33dp;padding:41.34dp 45.93dp;border:3.44dp #2a211a59;border-radius:36.75dp;background-color:#fffdf6;font-family:Modern;font-size:31dp;line-height:41.34dp;color:#2a211a;} +.es-dlg h2 {display:block;margin:0;font-family:Display;font-weight:normal;font-size:55.12dp;line-height:64.31dp;color:#2a211a;} +.es-dlg p {display:block;margin:0;} +.es-dlg-act {display:flex;justify-content:flex-end;align-items:center;gap:18.37dp;} +.es-dl {display:block;flex:1;min-width:0;} +.es-dl div {display:flex;gap:27.56dp;} +.es-dl span {display:block;flex:none;width:137.8dp;color:#645c50;} +.es-dl strong {display:block;flex:1;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-stage .es-choice,.es-stage .es-choice:hover,.es-stage .es-choice:focus {display:block;width:100%;padding:18.37dp 27.56dp;margin:0;border:3.44dp #2a211a33;border-radius:22.97dp;background-color:#fffdf680;decorator:none;text-align:left;font-family:Modern;font-size:31dp;color:#2a211a;} +.es-stage .es-choice:hover {border-color:#b2622d;background-color:#ffe1d0;} +.es-stage .es-choice strong,.es-stage .es-choice span {display:block;} +.es-stage .es-choice span {font-size:27.56dp;color:#645c50;} +.es-error {display:block;min-height:36.75dp;font-size:27.56dp;color:#a8452f;} + +/* the season's opening */ +.es-ent {display:flex;flex:1;flex-wrap:wrap;gap:22.97dp;align-content:center;justify-content:center;min-height:0;overflow-y:auto;} +.es-ent-card {display:flex;flex:none;align-items:center;gap:32.15dp;width:909.47dp;padding:27.56dp 36.75dp;} +.es-ent-card.one {width:1841.91dp;gap:55.12dp;padding:55.12dp 68.9dp;} +.es-ent-card.own {background-color:#ffe1d0;border-color:#b2622d;} +.es-ent-name {display:block;font-family:Display;font-size:45.93dp;line-height:55.12dp;color:#2a211a;} +.es-ent-card.one .es-ent-name {font-size:82.68dp;line-height:91.87dp;} +.es-own {display:inline-block;margin-top:9.19dp;padding:4.59dp 22.97dp;border-radius:22.97dp;background-color:#b2622d;font-weight:bold;font-size:26.41dp;line-height:34.45dp;color:#fff8ea;} +.es-draw-art {position:relative;display:block;flex:none;height:519.04dp;padding:13.78dp;border-radius:18.37dp;background-color:#fffdf6;overflow:hidden;} +.es-draw-pic {display:block;overflow:hidden;border-radius:6.89dp;} +.es-stage .es-draw-dot {position:absolute;left:auto;right:41.34dp;top:41.34dp;bottom:auto;display:block;width:27.56dp;height:27.56dp;margin:0;border:4.59dp #00000059;border-radius:18.37dp;background-color:#fff8ea;} +.es-stage .es-draw-dot.is-paused {opacity:.45;} +.es-pair {display:flex;flex:none;align-items:center;gap:9.19dp;height:48.23dp;padding:0 13.78dp;border:3.44dp transparent;border-radius:16.08dp;font-size:26.41dp;line-height:34.45dp;color:#2a211a;} +.es-pair.big {height:142.39dp;gap:22.97dp;padding:0 32.15dp;border-color:#2a211a33;border-radius:32.15dp;background-color:#fffdf699;} +.es-pair.own,.es-pair.big.own {background-color:#ffe1d0;border-color:#b2622d;color:#643312;} +.es-pair-n {display:block;flex:none;width:50.53dp;font-family:Display;font-size:25.26dp;color:#8c491a;} +.es-pair.big .es-pair-n {width:91.87dp;font-size:45.93dp;line-height:55.12dp;} +.es-pair-s {display:flex;flex:1;align-items:center;gap:11.48dp;min-width:0;} +.es-pair-s.home {justify-content:flex-end;} +.es-pair.big .es-pair-s {gap:22.97dp;} +.es-pair-s strong {display:block;font-size:26.41dp;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-pair.big .es-pair-s strong {font-family:Display;font-weight:normal;font-size:43.64dp;line-height:55.12dp;} +.es-pair-s strong.unknown {color:#82796a;} +.es-pair-v {display:block;flex:none;width:22.97dp;text-align:center;} +.es-pair.big .es-pair-v {width:55.12dp;} +.es-pair-ph {display:block;flex:none;width:41.34dp;height:41.34dp;border:3.44dp #a19786;border-radius:20.67dp;} +.es-pair.big .es-pair-ph {width:101.05dp;height:101.05dp;border-radius:50.53dp;} +.es-recent {display:block;flex:none;height:146.99dp;margin-top:4.59dp;} +.es-cols {display:flex;flex:1;gap:36.75dp;min-height:0;overflow-y:auto;} +.es-cols>div {display:block;flex:1;min-width:0;} + +/* mods, saved games and the sound, opened from the main menu */ +.es-stage .es-li,.es-stage .es-li:hover,.es-stage .es-li:focus,.es-stage .es-li:disabled {display:block;flex:none;width:100%;padding:18.37dp 27.56dp;margin:0 0 4.59dp;border:3.44dp transparent;border-radius:22.97dp;background-color:transparent;decorator:none;text-align:left;font-family:Modern;font-size:31dp;line-height:41.34dp;color:#2a211a;opacity:1;} +.es-stage .es-li:hover {background-color:#fffdf6b3;} +.es-stage .es-li.sel,.es-stage .es-li.sel:hover {background-color:#ffe1d0;border-color:#b2622d;} +.es-stage .es-li strong,.es-stage .es-li span {display:block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-stage .es-li span {font-size:27.56dp;color:#645c50;} +.es-list {display:block;flex:none;min-height:0;overflow-y:auto;overflow-x:hidden;} +.es-detail {display:flex;flex:1;flex-direction:column;gap:13.78dp;min-height:0;overflow:hidden;} +.es-kv {display:flex;gap:27.56dp;padding:6.89dp 0;border-bottom:2.3dp #2a211a14;} +.es-kv span {display:block;flex:none;width:183.73dp;color:#645c50;} +.es-kv strong {display:block;flex:1;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.es-paper .fl-crest {width:137.8dp;height:137.8dp;} +.es-paper .pg-stat {padding:13.78dp 18.37dp;} +.es-sound {display:block;flex:1;min-height:0;padding:13.78dp 183.73dp 0 0;overflow-y:auto;} +.es-sound .settings-group h3 {display:none;} +.es-sound .settings-row {min-height:101.05dp;gap:45.93dp;padding:13.78dp 0;} +.es-sound .settings-row label>span {font-size:34.45dp;line-height:45.93dp;} +.es-sound select {width:390.43dp;} +.es-stage .es-mb.gap {border-top-width:0dp;} +.es-stage .es-mode[disabled],.es-stage .es-mode[disabled]:hover {opacity:1;} +.es-stage .es-mode.off,.es-stage .es-mode.off:hover,.es-stage .es-mode.off[disabled] {opacity:.55;} +.es-paper .es-seg {height:68.9dp;border-radius:34.45dp;} +.es-paper .es-seg button,.es-paper .es-seg button:disabled {height:62.01dp;line-height:62.01dp;padding:0 18.37dp;font-size:26.41dp;} +.es-paper select.es-narrow {width:243.44dp;} +.es-pair-s {overflow:hidden;} +.es-pair-s strong,.es-pair.big .es-pair-s strong {flex:none;overflow:visible;text-overflow:clip;} +.es-stage .es-draw-dot {width:32.15dp;height:32.15dp;border-width:0dp;border-radius:16.08dp;} +.es-foot .es-note {min-width:0;pointer-events:none;} diff --git a/src/modern/ui/controls.inc b/src/modern/ui/controls.inc index c41da2e..7385588 100644 --- a/src/modern/ui/controls.inc +++ b/src/modern/ui/controls.inc @@ -475,6 +475,17 @@ void App::ProcessEvent(Rml::Event &event) try { void App::dispatch(const std::string &action, Rml::Element *target) { const auto id = target ? target->GetAttribute("data-id", "") : std::string(); + // the ribbon of the notebook leads back to the main menu, after asking + if (action == "nb-home") { + if (engine_mode_) { + if (engine_busy_ || engine_files_busy_ || !popup_.empty()) return; + confirmation(engine_dirty_ ? "Zurück ins Hauptmenü? Was seit dem letzten Speichern geschah, geht verloren." : "Zurück ins Hauptmenü?", [this] { engine_manager_main(); }); + popup_accept_ = "Zum Hauptmenü"; + } else if (source_ && scene_ == "desktop") { + dispatch("context-quit", target); + } + return; + } if(front_action(action,target))return; if (live_action(action, target)) return; if(national_action(action,target))return; @@ -540,9 +551,26 @@ void App::dispatch(const std::string &action, Rml::Element *target) { return; } if (action == "exit") { + // the main menu asks first + if (scene_ == "main" && menu_.empty() && !front_quit_) { + front_quit_ = true; + focus_after_render_ = "front-quit-no"; + refresh(); + return; + } closed_ = true; return; } + if (action == "front-quit-yes") { + closed_ = true; + return; + } + if (action == "front-quit-no") { + front_quit_ = false; + focus_after_render_ = "front-exit"; + refresh(); + return; + } if (action == "quit-without-save") { closed_ = true; return; diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index 54db83e..b7d9450 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -327,7 +327,7 @@ void App::engine_event(Rml::Event &event) { if (!engine_busy_ && popup_.empty() && contracts_event(event)) return; if(engine_opening_active()&&menu_.empty()&&popup_.empty()) { if(type=="keydown") {const auto key=Rml::Input::KeyIdentifier(event.GetParameter("key_identifier",0)); - if(key==Rml::Input::KI_TAB){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".opening-actions button");std::erase_if(nodes,[](auto *n){return n->HasAttribute("disabled");});if(!nodes.empty()){const auto it=std::find(nodes.begin(),nodes.end(),context_->GetFocusElement());const int i=it==nodes.end()?-1:int(it-nodes.begin()),n=int(nodes.size());nodes[size_t((i+n+(event.GetParameter("shift_key",0)?-1:1))%n)]->Focus(true);}event.StopImmediatePropagation();return;} + if(key==Rml::Input::KI_TAB){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".es-foot button");std::erase_if(nodes,[](auto *n){return n->HasAttribute("disabled");});if(!nodes.empty()){const auto it=std::find(nodes.begin(),nodes.end(),context_->GetFocusElement());const int i=it==nodes.end()?-1:int(it-nodes.begin()),n=int(nodes.size());nodes[size_t((i+n+(event.GetParameter("shift_key",0)?-1:1))%n)]->Focus(true);}event.StopImmediatePropagation();return;} if(key==Rml::Input::KI_RETURN||key==Rml::Input::KI_SPACE){for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->GetTagName()=="button"&&!n->HasAttribute("disabled")){n->DispatchEvent("click",{});break;}}} if(type=="click")for(auto *n=target;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-action")){opening_action(n->GetAttribute("data-action",""),n);break;} event.StopImmediatePropagation();return; @@ -476,6 +476,13 @@ void App::engine_event(Rml::Event &event) { if (engine_sports_action(action, id, node)) return; if (engine_lineup_action(action, id, node)) return; if (action == "close") { if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll(); menu_.clear(); refresh(); } + // the ribbon of the notebook: back to the main menu, after asking + else if (action == "nb-home") { + if (!engine_busy_ && !engine_files_busy_ && popup_.empty()) { + confirmation(engine_dirty_ ? "Zurück ins Hauptmenü? Was seit dem letzten Speichern geschah, geht verloren." : "Zurück ins Hauptmenü?", [this] { engine_manager_main(); }); + popup_accept_ = "Zum Hauptmenü"; + } + } else if (action == "engine-ticket" && engine_fresh_) { const auto price = engine_ticket_projection(engine_data_); ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true; diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index 83dad86..c78cf7f 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -57,7 +57,7 @@ void App::engine_render() { } else if (scene_ == "live" && live_.available()) { out = render_live(); } else if(engine_opening_active()&&menu_.empty()) { - out=main_menu()+"
"+render_opening()+"
"; + out=render_opening(); } else { const auto &desk = engine_data_.at("desktop").at("data"), &meta = engine_data_.at("desktop").at("meta"); const auto &team = desk.at("team"), &person = desk.at("manager"); @@ -232,7 +232,9 @@ void App::engine_render() { notebook_finish(out); element("canvas")->SetInnerRML(out); ++document_generation_; setting_menu_markup_ = false; + needs_render_ = false; sync_window_zoom(); + const bool resized = needs_render_; // the stage changed its height: it is drawn once more live_detail_pending_ = live_ticker_pending_ = false; scale_chalk_shadow(); if (!engine_player_.empty()) { @@ -264,5 +266,5 @@ void App::engine_render() { Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input"); for (auto *node : controls) node->SetAttribute("disabled", true); } - needs_render_ = false; dirty_ = true; + needs_render_ = resized; dirty_ = true; } diff --git a/src/modern/ui/entry_controls.inc b/src/modern/ui/entry_controls.inc index 3b8d8ce..a2cc94b 100644 --- a/src/modern/ui/entry_controls.inc +++ b/src/modern/ui/entry_controls.inc @@ -168,7 +168,7 @@ void App::entry_confirm() { {"club", selected_club_}, {"portrait", portrait}, {"portrait_style", - selections_["portrait-style"] == "painted" ? "painted" : "photo"}, + "painted"}, // one style of portrait {"strength_choice", selections_["manager-strength"].empty() ? 1 : std::stoi(selections_["manager-strength"])}}); @@ -314,6 +314,12 @@ bool App::entry_action(const std::string &action, Rml::Element *target) { league_ = entry_picker_league_; manager_picker_ = false; focus_after_render_ = "manager-clubs"; + } else if (action == "manager-strength-pick") { + if (entry_full() || (id != "0" && id != "1" && id != "2")) + return true; + selections_["manager-name"] = field("manager-name"); + selections_["manager-strength"] = id; + focus_after_render_ = "manager-strength-" + id; } else if (action == "portrait-style") { selections_["manager-name"] = field("manager-name"); if (id == "photo" || id == "painted") diff --git a/src/modern/ui/entry_opening_screens.inc b/src/modern/ui/entry_opening_screens.inc index 9b2e1ca..7605d1b 100644 --- a/src/modern/ui/entry_opening_screens.inc +++ b/src/modern/ui/entry_opening_screens.inc @@ -2,260 +2,106 @@ // Read-only presentation of canonical DemoSource opening_flow. No extra App // API. Timer, phase changes, persistence, keyboard handling and completion // belong to the controller. No participants or pairings are invented by the -// renderer. +// renderer. The pages are written on the pad of the entry (front_screens.inc). std::string App::render_opening() { - const auto state = engine_mode_?engine_opening_state_:snap().state; + const auto state = engine_mode_ ? engine_opening_state_ : snap().state; const auto &flow = state.at("opening_flow"); const auto phase = flow.at("phase").get(); const bool playing = flow.value("playing", false) && !opening_io_blocked_; + const auto u = [](double units) { return units * kEntryUnit; }; std::set own; - for (const auto &m : state.at("managers")) - own.insert(m.value("club", "")); + for (const auto &m : state.at("managers")) own.insert(m.value("club", "")); std::vector order; std::set seen; for (const auto &id : flow.at("order")) { - if (!id.is_string()) - continue; + if (!id.is_string()) continue; const auto key = id.get(); - if (const auto *c = world_->find("clubs", key); - c && seen.insert(key).second) - order.push_back(c); + if (const auto *c = world_->find("clubs", key); c && seen.insert(key).second) order.push_back(c); } const int total = int(order.size()), pairs = total / 2; const int revealed = std::clamp(flow.value("revealed", 0), 0, total); - const auto date = state.value( - "date", world_->manifest().value("start_date", std::string())); + const auto date = state.value("date", world_->manifest().value("start_date", std::string())); std::string season = "–"; - if (date.size() >= 4 && - std::all_of(date.begin(), date.begin() + 4, - [](char c) { return c >= '0' && c <= '9'; })) { + if (date.size() >= 4 && std::all_of(date.begin(), date.begin() + 4, [](char c) { return c >= '0' && c <= '9'; })) { const int year = std::stoi(date.substr(0, 4)); const int following = (year + 1) % 100; - season = std::to_string(year) + "/" + (following < 10 ? "0" : "") + - std::to_string(following); + season = std::to_string(year) + "/" + (following < 10 ? "0" : "") + std::to_string(following); } - const auto owned = [&](const Json *c) { - return c && own.contains(c->value("id", "")); + const auto owned = [&](const Json *c) { return c && own.contains(c->value("id", "")); }; + // what a demo world shows is made up; a career says nothing of the kind + const auto note = [&](const std::string &lead, const std::string &demo) { + return "" + esc(lead + (engine_mode_ || demo.empty() ? std::string() : (lead.empty() ? "" : " · ") + demo)) + ""; }; - const auto heading = [&](const std::string &title, - const std::string &subtitle, - const std::string &detail) { - return "

" + esc(title) + - "

" + esc(subtitle) + - "

" - "" + - esc(detail) + "
"; - }; - const auto note = [&](const std::string &text) { - if(engine_mode_)return std::string(); - return "" + esc(text) + ""; - }; - const auto pair = [&](int index, int known, int logo_size, - const std::string &extra) { - if (index < 0 || index >= pairs) - return std::string(); - const auto *home = order[size_t(index * 2)], - *away = order[size_t(index * 2 + 1)]; + const auto pair = [&](int index, int known, bool big) { + if (index < 0 || index >= pairs) return std::string(); + const auto *home = order[size_t(index * 2)], *away = order[size_t(index * 2 + 1)]; const auto side = [&](const Json *c, bool home_side, bool visible) { - const auto name = visible ? world_->name(*c) - : home_side ? "Heim" - : "Noch nicht gezogen"; - const auto text = "" + esc(name) + - ""; - const auto logo = visible ? "" + - crest(c, logo_size) + "" - : ""; - return "" + - (home_side ? text + logo : logo + text) + ""; + const auto name = visible ? world_->name(*c) : home_side ? "Heim" : "Noch nicht gezogen"; + const auto text = "" + esc(name) + ""; + const auto logo = visible ? "" + crest(c, u(big ? 44 : 18)) + "" : std::string(""); + return "" + (home_side ? text + logo : logo + text) + ""; }; - return "
value("id", "")) + "\" data-away=\"" + - esc(away->value("id", "")) + - "\">" - "" + - std::to_string(index + 1) + "" + - side(home, true, known > 0) + - "–" + - side(away, false, known > 1) + - "
"; + return "
0 && owned(home)) || (known > 1 && owned(away)) ? " own" : "") + "\" data-index=\"" + std::to_string(index) + "\" data-home=\"" + esc(home->value("id", "")) + + "\" data-away=\"" + esc(away->value("id", "")) + "\">" + std::to_string(index + 1) + "." + side(home, true, known > 0) + "–" + side(away, false, known > 1) + "
"; }; - const bool entrants_page = - phase == "uefa" || phase == "champions" || phase == "winners"; - std::string body, titlebar; - if (entrants_page) { + if (phase == "uefa" || phase == "champions" || phase == "winners") { const int page = phase == "uefa" ? 0 : phase == "champions" ? 1 : 2; - const std::array titles = {"UEFA-Cup", "Champions League", - "Europapokal der Pokalsieger"}; + const std::array titles = {"UEFA-Cup", "Champions League", "Europapokal der Pokalsieger"}; std::vector entrants; std::set entered; - const auto &ids = flow.at("entrants").at(phase); - for (const auto &id : ids) { - if (!id.is_string()) - continue; + for (const auto &id : flow.at("entrants").at(phase)) { + if (!id.is_string()) continue; const auto key = id.get(); - if (const auto *c = world_->find("clubs", key); - c && entered.insert(key).second) - entrants.push_back(c); + if (const auto *c = world_->find("clubs", key); c && entered.insert(key).second) entrants.push_back(c); } - const bool german = - !entrants.empty() && - std::all_of(entrants.begin(), entrants.end(), [](const auto *c) { - return c->value("nation", "") == "nation:de"; - }); - titlebar = german ? "Deutsche Teams" : "Teilnehmende Teams"; - body = "
" + - heading(titles[size_t(page)], titlebar + " · Saison " + season, - std::to_string(page + 1) + " / 3") + - "
"; - if (entrants.empty()) { - body += "

Keine " - "Teilnehmer eingetragen

" - "

"+std::string(engine_mode_?"Für diesen Wettbewerb sind derzeit keine deutschen Vereine gemeldet.":"Für diesen Wettbewerb sind in dieser Demo-Welt keine Vereine vorgesehen.")+"

"; - } else { - const bool single = entrants.size() == 1; - const auto card = [&](const Json *c) { - return "
value("id", "")) + "\">" + - "
" + - crest(c, single ? 620 : 360) + - "
" - "

" + - esc(world_->name(*c)) + "

" + - (owned(c) ? "

Dein Verein

" : "") + - "
"; - }; - body += "
"; - if (single) { - body += card(entrants.front()); - } else { - const size_t rows = std::max(size_t(2), (entrants.size() + 1) / 2); - for (size_t row = 0; row < rows; ++row) { - body += "
"; - for (size_t column = 0; column < 2; ++column) { - const size_t index = row * 2 + column; - body += index < entrants.size() - ? card(entrants[index]) - : "
"; - } - body += "
"; - } - } - body += "
"; - } - body += "
"; - } else if (phase == "draw") { - titlebar = "DFB-Pokal"; - body = - "
" + - heading("1. Runde", "DFB-Pokal · Saison " + season, - std::to_string(revealed) + " / " + std::to_string(total) + - " Mannschaften") + - "
"; - // a data set may carry a newer picture of the draw - auto art = renderer_.image("art.cup-draw-v2.png", false, 1800); - if (art.token.empty()) art = renderer_.image("art.cup-draw-v1.png", false, 1800); - if (!art.token.empty() && art.width > 0 && art.height > 0) { - const double ratio = double(art.width) / art.height; - const double width = std::min(2608.0, 846.0 * ratio), - height = width / ratio; - body += "
" + - picture(art, width, height, false) + "
"; - } else { - body += "

Die Illustration der " - "Auslosung ist nicht verfügbar.

"; - } - body += - "
" - "
"; + const bool german = !entrants.empty() && std::all_of(entrants.begin(), entrants.end(), [](const auto *c) { return c->value("nation", "") == "nation:de"; }); + std::string cards; + if (entrants.empty()) + cards = "
Keine Teilnehmer eingetragen" + + std::string(engine_mode_ ? "Für diesen Wettbewerb sind derzeit keine deutschen Vereine gemeldet." : "Für diesen Wettbewerb sind in dieser Demo-Welt keine Vereine vorgesehen.") + "
"; + const bool single = entrants.size() == 1; + for (const auto *c : entrants) + cards += "
value("id", "")) + "\">" + + crest(c, u(single ? 150 : 72)) + "
" + esc(world_->name(*c)) + "" + (owned(c) ? "Dein Verein" : "") + "
"; + return entry_pad("Teilnehmer · " + std::to_string(page + 1) + " / 3", titles[size_t(page)], + "" + std::string(german ? "Deutsche Teams" : "Teilnehmende Teams") + " · Saison " + season + + "
" + cards + "
", + note("", "Fiktive Demo-Qualifikation") + pg_button("opening-next", "Weiter", "primary", "id=\"opening-next\"")); + } + if (phase == "draw") { + std::string body = "
" + + (gui_.contains("entry.draw") ? img("entry.draw", u(790), u(790) * 724 / 2172, false, false, 1800) : std::string()) + "
"; if (pairs) { const int current = std::min(pairs - 1, std::max(0, (revealed - 1) / 2)); const int known = std::clamp(revealed - current * 2, 0, 2); - body += pair(current, known, 66, "current") + - "
"; - const int first = std::max(0, current - 3); - for (int i = first; i < current; ++i) - body += "
" + - pair(i, 2, 42, "recent") + "
"; - body += "
"; - } else { - body += "

Für diese Welt ist keine " - "vollständige Paarung vorhanden.

"; - } - body += - "
"; - } else { - titlebar = "DFB-Pokal"; - body = "
" + - heading("DFB-Pokal", "1. Runde · Saison " + season, - std::to_string(pairs) + - (pairs == 1 ? " Paarung" : " Paarungen")) + - "
"; - if (!pairs) { - body += "

Für diese Welt " - "sind keine vollständigen Paarungen vorhanden.

"; - } else { - const int columns = pairs > 1 ? 2 : 1, - per_column = (pairs + columns - 1) / columns; - for (int column = 0; column < columns; ++column) { - const int first = column * per_column, - last = std::min(pairs, first + per_column); - body += "
"; - for (int i = first; i < last; ++i) - body += "
" + - pair(i, 2, 36, "compact") + "
"; - body += "
"; - } - } - body += "
"; + body += pair(current, known, true) + "
ZULETZT GEZOGENE PAARUNGEN
"; + // the newest first + for (int i = current - 1; i >= std::max(0, current - 3); --i) body += pair(i, 2, false); + if (current == 0) body += "Noch keine Paarung vollständig."; + body += "
"; + } else + body += "Für diese Welt ist keine vollständige Paarung vorhanden."; + return entry_pad("Auslosung · Saison " + season, "DFB-Pokal · 1. Runde", body + "", + note(revealed >= total ? "Alle Lose sind gezogen." : "Los " + std::to_string(revealed) + " von " + std::to_string(total), + total % 2 ? "Fiktive Demo-Auslosung, 1 Verein ohne Paarung" : "Fiktive Demo-Auslosung") + + pg_button("opening-play", opening_io_blocked_ ? "Erneut versuchen" : playing ? "Pause" : "Fortsetzen", "", + "id=\"opening-play\" aria-pressed=\"" + std::string(playing ? "true" : "false") + "\" " + (revealed >= total ? "disabled=\"disabled\"" : "")) + + pg_button("opening-all", "Alle Paarungen anzeigen", "primary", "id=\"opening-all\"")); } - return window(titlebar, body, false); + std::string body = "
"; + if (!pairs) + body += "Für diese Welt sind keine vollständigen Paarungen vorhanden."; + else { + const int columns = pairs > 1 ? 2 : 1, per_column = (pairs + columns - 1) / columns; + for (int column = 0; column < columns; ++column) { + const int first = column * per_column, last = std::min(pairs, first + per_column); + body += "
"; + for (int i = first; i < last; ++i) body += pair(i, 2, false); + body += "
"; + } + } + return entry_pad("Übersicht · " + std::to_string(pairs) + (pairs == 1 ? " Paarung" : " Paarungen"), "DFB-Pokal · 1. Runde", body + "
", + note("Saison " + season, total % 2 ? "ohne Paarung: " + world_->name(*order.back()) : "Fiktive Demo-Auslosung") + + pg_button("opening-finish", "Weiter zum Notizbuch", "primary", "id=\"opening-finish\"")); } diff --git a/src/modern/ui/entry_screens.inc b/src/modern/ui/entry_screens.inc index a9ab3da..2957851 100644 --- a/src/modern/ui/entry_screens.inc +++ b/src/modern/ui/entry_screens.inc @@ -6,428 +6,191 @@ // manager_success_; existing start_options_, managers_draft_, selections_, // country_, league_, selected_club_, manager_index_, manager_picker_, // adding_manager_ remain the draft contract. +// Both screens are written on the pad of the entry (front_screens.inc); lengths are the +// entry's design units. std::string App::render_newgame() { start_options_["mode"] = 3; - const std::array keys = {"duration", "difficulty", - "players"}, - names = {"Spieldauer", "Schwierigkeit", - "Mitspieler"}; - const std::array limits = { - 5, 10, start_options_.value("league", true) ? 4 : 1}; - std::string body = - "

Grundeinstellungen

Deine " - "Karriere · alle Funktionen

"; + const auto u = [](double units) { return units * kEntryUnit; }; + const std::array keys = {"duration", "difficulty", "players"}, names = {"Spieldauer", "Schwierigkeit", "Mitspieler"}; + const std::array limits = {5, 10, start_options_.value("league", true) ? 4 : 1}; + const int players = start_options_.value("players", 1); + std::string left; for (size_t i = 0; i < keys.size(); ++i) { const std::string key = keys[i]; const int value = start_options_.value(key, 1); std::string visual, caption; if (i == 0) { - visual = "" + - std::string(value == 5 ? "∞" : std::to_string(value)) + - ""; + visual = "" + std::string(value == 5 ? "∞" : std::to_string(value)) + ""; caption = value == 5 ? "Unbegrenzt" : value == 1 ? "Saison" : "Saisons"; } else if (i == 1) { - const int columns = std::min(5, value); - visual = "
"; + visual = "
"; for (int j = 0; j < value; ++j) - visual += - "
" + - picture(renderer_.diagram( - "setup-ball", - "", - 128), - 62, 62) + - "
"; + visual += "" + + picture(renderer_.diagram("entry-ball", + "" + "", + 128), + u(38), u(38)) + + ""; visual += "
"; caption = "Spielstärke " + std::to_string(value) + " von 10"; } else { - visual = "
"; + // as many faces as managers will sit at this machine + visual = "
"; for (int j = 0; j < value; ++j) - visual += picture( - renderer_.diagram( - "setup-person", - "", - 192), - 60, 112); + visual += " 3 && j ? " near" : "") + "\">" + img("manager-painted." + std::to_string(j), u(62), u(62) * 4 / 3, false, true, 350) + ""; visual += "
"; - caption = std::to_string(value) + " Mitspieler"; + caption = value == 1 ? "Einzelspiel" : std::to_string(value) + " Manager an einem Rechner"; } - body += "

" + names[i] + - "

"; - body += btn("setup-step", "−", "entry-setup-minus", - "id=\"setup-" + key + "-minus\" data-id=\"" + key + - "\" data-step=\"-1\" aria-label=\"" + names[i] + - " verringern\" " + (value == 1 ? "disabled" : "")); - body += "
" + visual + - "" + caption + "
"; - body += btn("setup-step", "+", "entry-setup-plus", - "id=\"setup-" + key + "-plus\" data-id=\"" + key + - "\" data-step=\"1\" aria-label=\"" + names[i] + - " erhöhen\" " + (value == limits[i] ? "disabled" : "")) + - "
"; + left += "
" + pg_upper(names[i]) + "" + + btn("setup-step", "−", "es-step", "id=\"setup-" + key + "-minus\" data-id=\"" + key + "\" data-step=\"-1\" aria-label=\"" + names[i] + " verringern\" " + (value == 1 ? "disabled=\"disabled\"" : "")) + + "
" + visual + "" + caption + "
" + + btn("setup-step", "+", "es-step", "id=\"setup-" + key + "-plus\" data-id=\"" + key + "\" data-step=\"1\" aria-label=\"" + names[i] + " erhöhen\" " + (value == limits[i] ? "disabled=\"disabled\"" : "")) + "
"; } - body += - "
"; + std::string cards; for (const auto *key : {"league", "world"}) { - const bool league = std::string(key) == "league", - active = start_options_.value(key, true), - locked = - league ? active && (start_options_.value("players", 1) > 1 || - !start_options_.value("world", true)) - : !start_options_.value("league", true); - body += btn( - "setup-competition", - img(league ? "career.club" : "career.international", 904, 1580, false, - false, 1600) + - "" + - std::string(league ? "Vereinsfußball" : "International · WM / EM") + - "" + (active ? "Aktiv" : "Auswählen") + - "" + - (active ? glyph("check", 38) : "○") + "", - std::string("entry-setup-competition ") + (active ? "selected" : ""), - "id=\"setup-competition-" + std::string(key) + "\" data-id=\"" + key + - "\" aria-pressed=\"" + (active ? "true" : "false") + "\" " + - (locked ? "disabled" : "")); + const bool league = std::string(key) == "league", active = start_options_.value(key, true), + locked = league ? active && (players > 1 || !start_options_.value("world", true)) : !start_options_.value("league", true); + cards += btn("setup-competition", + "" + img(league ? "entry.club" : "entry.international", u(179), u(346), false, true, 1200) + "" + + std::string(league ? "Vereinsfußball" : "International · WM / EM") + "" + (active ? glyph("check", u(17)) : std::string()) + "", + std::string("es-mode ") + (league ? "a" : "b") + (active ? " on" : " off"), + "id=\"setup-competition-" + std::string(key) + "\" data-id=\"" + key + "\" aria-pressed=\"" + (active ? "true" : "false") + "\" aria-label=\"" + + (league ? "Vereinsfußball" : "International, WM und EM") + (active ? ", aktiv" : ", abgewählt") + "\" " + (locked ? "disabled=\"disabled\"" : "")); } - body += "

" + - std::string( - start_options_.value("players", 1) > 1 - ? "Bei mehreren Mitspielern bleibt der Vereinsfußball aktiv." - : !start_options_.value("league", true) - ? "Nationalmannschaft · ein Mitspieler · Deutschland" - : "Mindestens ein Wettbewerb bleibt aktiv.") + - "

Dauer, " - "Schwierigkeit und Mitspielerzahl gelten für deine neue " - "Partie.

" + - btn("close", "Abbrechen") + - btn("setup-next", "Weiter", "primary", "id=\"setup-next\"") + - "
"; - return window("Neues Spiel", body); + const std::string hint = std::string(players > 1 ? "Bei mehreren Mitspielern bleibt der Vereinsfußball an. " + : !start_options_.value("league", true) ? "Nationalmannschaft · ein Mitspieler · Deutschland. " + : "Ein Bild anklicken, um den Wettbewerb ab- oder anzuwählen; einer bleibt immer an. ") + + "Nationaltrainer nur allein und nur für Deutschland."; + return entry_pad("Neues Spiel", "Grundeinstellungen", + "
" + left + + "
" + cards + + "
" + hint + "
", + pg_button("close", "Abbrechen") + pg_button("setup-next", "Weiter", "primary", "id=\"setup-next\"")); } std::string App::render_manager() { const auto catalog = entry_world(); if (!catalog) - return window("Neuer Spieler", - "

Bitte zuerst eine Modern-Mod aktivieren.

"); + return entry_pad("Neues Spiel", "Neuer Spieler", "
Bitte zuerst eine Modern-Mod aktivieren.
", pg_button("close", "Zurück")); + const auto u = [](double units) { return units * kEntryUnit; }; const bool national = career_national_entry(); - if(engine_creation_busy_||(engine_mode_&&engine_busy_))return window(adding_manager_?"Neuer Spieler":"Neues Spiel","

"+std::string(adding_manager_?"Mitspieler wird hinzugefügt …":"Die Partie wird vorbereitet …")+"

",false); + if (engine_creation_busy_ || (engine_mode_ && engine_busy_)) + return entry_pad(adding_manager_ ? "Neuer Spieler" : "Neues Spiel", adding_manager_ ? "Mitspieler wird hinzugefügt …" : "Die Partie wird vorbereitet …", + "
Einen Augenblick.
", ""); const bool full = entry_full(), modal = manager_confirm_ || manager_success_; - const int limit = - adding_manager_ ? (national ? 1 : 4) : start_options_.value("players", 1); - const int portrait = - selections_["portrait"].empty() ? 0 : std::stoi(selections_["portrait"]); - const std::string style = - selections_["portrait-style"] == "painted" ? "painted" : "photo"; - const std::array strengths = { - "Unteres Drittel", "Mittelfeld", "Oberes Drittel"}; - const int strength = - std::clamp(selections_["manager-strength"].empty() - ? 1 - : std::stoi(selections_["manager-strength"]), - 0, 2); - const auto face = [&](int index, const std::string &variant, int width, - const std::string &extra = "") { - return "
" + - img(std::string(variant == "painted" ? "manager-painted." - : "manager.") + - std::to_string(index), - width, width * 4.0 / 3.0, false, true, 350) + - "
"; - }; - const auto club_name = [&](const Json *c) { - return national ? std::string("Deutschland") - : c ? catalog->name(*c) - : std::string("Kein spielbarer Verein"); + const int limit = adding_manager_ ? (national ? 1 : 4) : start_options_.value("players", 1); + const int portrait = selections_["portrait"].empty() ? 0 : std::stoi(selections_["portrait"]); + const std::array strengths = {"Unteres Drittel", "Mittelfeld", "Oberes Drittel"}; + const int strength = std::clamp(selections_["manager-strength"].empty() ? 1 : std::stoi(selections_["manager-strength"]), 0, 2); + const std::string off = "disabled=\"disabled\""; + // one style of portrait: the painted one + const auto face = [&](int index, double width, const std::string &extra = "") { + return "" + + img("manager-painted." + std::to_string(index), u(width), u(width) * 4.0 / 3.0, false, true, 350) + ""; }; + const auto club_name = [&](const Json *c) { return national ? std::string("Deutschland") : c ? catalog->name(*c) : std::string("Kein spielbarer Verein"); }; const auto league_name = [&](const Json *c) { - if (national) - return std::string("Nationalmannschaft"); - const auto *l = - c ? catalog->find("competitions", entry_club_league(c->value("id", ""))) - : nullptr; + if (national) return std::string("Nationalmannschaft"); + const auto *l = c ? catalog->find("competitions", entry_club_league(c->value("id", ""))) : nullptr; return l ? catalog->name(*l) : std::string(); }; std::vector> countries, choices; std::set seen; for (const auto *l : catalog->leagues()) { const auto id = l->value("nation", ""); - if (seen.insert(id).second) - countries.emplace_back(id, catalog->nation_name(id)); + if (seen.insert(id).second) countries.emplace_back(id, catalog->nation_name(id)); } - const auto leagues = catalog->leagues(country_); - for (const auto *l : leagues) - choices.emplace_back(l->value("id", ""), catalog->name(*l)); - const auto choose = - [&](const std::string &id, - const std::vector> &rows, - const std::string &value) { - auto out = select(id, rows, value, id); - out.insert(out.find('>'), " data-select-style=\"league\""); - if (full) - out.insert(out.find('>'), " disabled"); - return out; - }; + for (const auto *l : catalog->leagues(country_)) choices.emplace_back(l->value("id", ""), catalog->name(*l)); + const auto choose = [&](const std::string &id, const std::vector> &rows, const std::string &value, const std::string &css = "") { + auto out = select(id, rows, value, id); + out.insert(out.find('>'), " data-select-style=\"league\"" + (css.empty() ? std::string() : " class=\"" + css + "\"") + (full ? " disabled" : "")); + return out; + }; const auto *selected = catalog->find("clubs", selected_club_); - std::string content; + std::string sheet; if (manager_picker_ && !national) { const auto query = settings_search_key(club_search_); std::vector clubs; for (const auto *c : entry_clubs(league_)) - if (query.empty() || settings_search_key(catalog->name(*c)).find(query) != - std::string::npos) - clubs.push_back(c); - content = - "

Verein " - "auswählen

Wähle ein Wappen für deinen neuen " - "Manager.

" + - btn("manager-clubs-back", "Zurück", {}, "id=\"manager-clubs-back\"") + - "
" + - choose("manager-country", countries, country_) + - choose("manager-league", choices, league_) + - "

" + - std::to_string(clubs.size()) + - (clubs.size() == 1 ? " Verein" : " Vereine") + - "

"; - const int rows = std::max(1, int((clubs.size() + 4) / 5)); - const double height = std::max(250.0, (1583.0 - (rows - 1) * 20) / rows); - content += "
"; + if (query.empty() || settings_search_key(catalog->name(*c)).find(query) != std::string::npos) clubs.push_back(c); + std::string tiles; for (size_t i = 0; i < clubs.size(); ++i) { const auto *c = clubs[i]; const auto id = c->value("id", ""); - const bool locked = !entry_manageable(id), used = entry_used_club(id), - chosen = id == selected_club_; - const std::string note = locked ? "Nicht spielbar · nur deutsche Vereine" - : used ? "Bereits vergeben" - : chosen ? "Ausgewählt" - : league_name(c); - content += - btn("manager-club", - "
" + crest(c, 120) + - "
" + esc(club_name(c)) + - "" + - (chosen && !used && !locked ? glyph("check", 20) : "") + - "" + esc(note) + "" + - (locked ? "" + - glyph("lock", 32) + "" - : ""), - "entry-club-choice " + std::string(chosen ? "selected" : ""), - "id=\"manager-team-" + std::to_string(i) + "\" data-id=\"" + - esc(id) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + - "\" style=\"position:absolute;" + - rect(4 + (i % 5) * 521.2, 4 + (i / 5) * (height + 20), 501.2, - height) + - "\" " + (locked || used || full ? "disabled" : "")); + const bool locked = !entry_manageable(id), used = entry_used_club(id), chosen = id == selected_club_; + const std::string note = locked ? "Nur deutsche Vereine" : used ? "Bereits vergeben" : chosen ? "Ausgewählt" : league_name(c); + tiles += btn("manager-club", "" + crest(c, u(54)) + "" + esc(club_name(c)) + "" + esc(note) + "", std::string("es-tile") + (chosen && !used && !locked ? " sel" : ""), + "id=\"manager-team-" + std::to_string(i) + "\" data-id=\"" + esc(id) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + "\" " + (locked || used || full ? off : "")); } - if (clubs.empty()) - content += "

Kein Verein mit diesem Namen in " - "dieser Liga.

"; - content += "
"; + if (clubs.empty()) tiles = "Kein Verein mit diesem Namen in dieser Liga."; + sheet = entry_sheet("Neuer Spieler", "Verein auswählen", + "
" + choose("manager-country", countries, country_) + choose("manager-league", choices, league_, "wide") + + "" + + std::to_string(clubs.size()) + (clubs.size() == 1 ? " Verein" : " Vereine") + "
" + tiles + "
", + pg_button("manager-clubs-back", "Zurück", "", "id=\"manager-clubs-back\"")); } else { - content = - "
" + - (full ? std::string(national ? "Nationaltrainer im Spiel" - : "Vier Mitspieler im Spiel") - : "Mitspieler " + std::to_string(manager_index_ + 1) + " von " + - std::to_string(limit)) + - "

Dein Name. Dein Verein. Dein Porträt.

" + - (adding_manager_ ? btn("manager-newgame", "Neues Spiel", {}, - "id=\"manager-newgame\"") - : "") + - "

So wirst du im Spiel " - "angesprochen.

Porträt " + - std::to_string(portrait + 1) + "
" + - face(portrait, style, 174) + - "

" + - std::string(national ? "Nationalmannschaft" : "Verein") + "

" + - btn("manager-clubs", - "
" + - (national - ? img("career.national-de", 176, 176, false, false, 512) - : crest(selected, 176)) + - "
" + esc(club_name(selected)) + - "" + - esc(selected - ? catalog->nation_name(selected->value("nation", "")) - : "") + - " · " + esc(league_name(selected)) + - "Verein wählen ›", - "entry-manager-club-button", - "id=\"manager-clubs\" aria-label=\"Verein wählen: " + - esc(club_name(selected)) + "\" " + - (full || national ? "disabled" : "")) + - "

Startliga

" + - choose("manager-country", countries, country_) + - choose("manager-league", choices, league_) + - "

Vereinsstärke

" + - choose("manager-strength", - {{"0", strengths[0]}, {"1", strengths[1]}, {"2", strengths[2]}}, - std::to_string(strength)) + - "

Managerporträt
"; - for (const auto *variant : {"photo", "painted"}) - content += - btn("portrait-style", - std::string(variant) == "photo" ? "Foto" : "Illustration", {}, - "id=\"manager-style-" + std::string(variant) + "\" data-id=\"" + - variant + "\" aria-pressed=\"" + - (style == variant ? "true" : "false") + "\" " + - (full ? "disabled" : "")); - content += "

"; - const int portrait_height = adding_manager_ ? 482 : 494; + std::string portraits; for (int i = 0; i < 12; ++i) { const bool used = entry_used_portrait(i), chosen = i == portrait; - content += - btn("portrait", - face(i, style, 174) + - "" + - (chosen && !used ? glyph("check", 20) : "") + "" + - (used ? "Vergeben" - : chosen ? "Ausgewählt" - : "Porträt " + std::to_string(i + 1)) + - "", - "entry-manager-portrait " + std::string(chosen ? "selected" : ""), - "id=\"manager-portrait-" + std::to_string(i) + "\" data-id=\"" + - std::to_string(i) + "\" role=\"radio\" aria-checked=\"" + - (chosen ? "true" : "false") + "\" aria-label=\"Porträt " + - std::to_string(i + 1) + (used ? ", bereits vergeben" : "") + - "\" tabindex=\"" + (chosen ? "0" : "-1") + - "\" style=\"position:absolute;" + - rect((i % 6) * 324, (i / 6) * (portrait_height + 16), 308, - portrait_height) + - "\" " + (used || full ? "disabled" : "")); + portraits += btn("portrait", face(i, 88) + (used ? "VERGEBEN" : ""), std::string("es-por") + (chosen && !used ? " sel" : ""), + "id=\"manager-portrait-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\" role=\"radio\" aria-checked=\"" + (chosen ? "true" : "false") + "\" aria-label=\"Porträt " + std::to_string(i + 1) + + (used ? ", bereits vergeben" : "") + "\" tabindex=\"" + (chosen ? "0" : "-1") + "\" " + (used || full ? off : "")); } - content += - "

" + - (full ? std::string("Es können höchstens vier Manager mitspielen.") - : adding_manager_ - ? "Mitspieler wird erst nach deiner Bestätigung hinzugefügt." - : "Bestätige nacheinander die Mitspieler für deine neue Partie.") + - "

" + - btn("manager-back", - full ? "Schließen" - : adding_manager_ ? "Abbrechen" - : "Zurück", - {}, "id=\"manager-back\"") + - btn("manager-next", - adding_manager_ ? "Mitspieler hinzufügen" - : manager_index_ + 1 == limit ? "Spiel starten" - : "Mitspieler bestätigen", - "primary", - "id=\"manager-next\" " + - std::string(full || !entry_name_valid() || !selected || - !entry_manageable(selected_club_) || - entry_used_club(selected_club_) || - entry_used_portrait(portrait) - ? "disabled" - : "")) + - "
"; + std::string seg; + for (int k = 0; k < 3; ++k) + seg += btn("manager-strength-pick", "" + std::string(strengths[size_t(k)]) + "", std::string(k == strength ? "on" : "") + (k == 0 ? " first" : ""), + "id=\"manager-strength-" + std::to_string(k) + "\" data-id=\"" + std::to_string(k) + "\" aria-pressed=\"" + (k == strength ? "true" : "false") + "\" " + (full ? off : "")); + const bool foreign = selected && !entry_manageable(selected_club_); + const std::string body = + "
" + face(portrait, 43.5) + "
" + + (national ? img("career.national-de", u(58), u(58), false, false, 512) : crest(selected, u(58))) + "
" + + std::string(national ? "NATIONALMANNSCHAFT" : "VEREIN") + "" + + pg_button("manager-clubs", "Verein wählen ›", "sm", "id=\"manager-clubs\" aria-label=\"Verein wählen: " + esc(club_name(selected)) + "\" style=\"height:" + es(24) + ";padding:0 " + es(10) + ";font-size:" + es(12) + ";\" " + + (full || national ? off : "")) + + "
" + esc(club_name(selected)) + + "" + esc(selected ? catalog->nation_name(selected->value("nation", "")) : "") + + (selected || national ? " · " : "") + esc(league_name(selected)) + "
" + + (national ? std::string() + : "
STARTLIGA" + choose("manager-country", countries, country_, "es-narrow") + choose("manager-league", choices, league_, "es-narrow") + + "STÄRKE
" + seg + "
") + + "
MANAGERPORTRÄT" + + (foreign ? "· SPIELBAR SIND NUR DEUTSCHE VEREINE" : "") + "
" + portraits + + "
"; + const std::string status = full ? "Es können höchstens vier Manager mitspielen." : adding_manager_ ? "Der Mitspieler kommt erst nach deiner Bestätigung dazu." : ""; + sheet = entry_sheet(full ? std::string(national ? "Nationaltrainer im Spiel" : "Vier Mitspieler im Spiel") : "Mitspieler " + std::to_string(manager_index_ + 1) + " von " + std::to_string(limit), "Neuer Spieler", body, + "" + status + "" + pg_button("manager-back", full ? "Schließen" : adding_manager_ ? "Abbrechen" : "Zurück", "", "id=\"manager-back\"") + + pg_button("manager-next", adding_manager_ ? "Mitspieler hinzufügen" : manager_index_ + 1 == limit ? "Spiel starten" : "Mitspieler bestätigen", "primary", + "id=\"manager-next\" " + std::string(full || !entry_name_valid() || !selected || !entry_manageable(selected_club_) || entry_used_club(selected_club_) || entry_used_portrait(portrait) ? off : "")), + adding_manager_ ? "
" + pg_button("manager-newgame", "Neues Spiel", "sm", "id=\"manager-newgame\"") + "
" : std::string()); } - std::string body = - "
" + content + - "
"; + std::string over; if (manager_confirm_) { - body += - "

Sind alle Angaben richtig?

" + - (national ? img("career.national-de", 200, 200, false, false, 512) - : crest(selected, 200)) + - "
" + - esc(selections_["manager-name"]) + "" + - esc(club_name(selected)) + "" + - esc(league_name(selected)) + " · " + strengths[size_t(strength)] + - "
" + face(portrait, style, 150) + "
" + - btn("manager-confirm-no", "Nein", {}, "id=\"manager-confirm-no\"") + - btn("manager-confirm-yes", "Ja", "primary", - "id=\"manager-confirm-yes\"") + - "
"; + over = "

Sind alle Angaben richtig?

" + "
" + face(portrait, 69) + "" + + (national ? img("career.national-de", u(76), u(76), false, false, 512) : crest(selected, u(76))) + "
Name" + esc(selections_["manager-name"]) + + "
Verein" + esc(club_name(selected)) + "
Liga" + esc(league_name(selected)) + "
" + + (national ? std::string() : "
Stärke" + std::string(strengths[size_t(strength)]) + "
") + "
" + + pg_button("manager-confirm-no", "Nein", "", "id=\"manager-confirm-no\"") + pg_button("manager-confirm-yes", "Ja", "primary", "id=\"manager-confirm-yes\"") + "
"; } else if (manager_success_) { - const auto &last = - managers_draft_.empty() ? Json::object() : managers_draft_.back(); + const auto &last = managers_draft_.empty() ? Json::object() : managers_draft_.back(); const auto *c = catalog->find("clubs", last.value("club", selected_club_)); - body += - "

Mitspieler hinzugefügt

" + - esc(last.value("name", selections_["manager-name"])) + " übernimmt " + - esc(club_name(c)) + ".

" + - btn("manager-success-close", "Verstanden", {}, - "id=\"manager-success-close\"") + - "
"; + over = "

Mitspieler hinzugefügt

" + + esc(last.value("name", selections_["manager-name"])) + " übernimmt " + esc(club_name(c)) + ".

" + pg_button("manager-success-close", "Verstanden", "primary", "id=\"manager-success-close\"") + + "
"; } - return window("Neuer Spieler", body); + return entry_stage("
" + sheet + "
", over); } diff --git a/src/modern/ui/files_screens.inc b/src/modern/ui/files_screens.inc index b9f9609..ac3572b 100644 --- a/src/modern/ui/files_screens.inc +++ b/src/modern/ui/files_screens.inc @@ -134,6 +134,7 @@ std::string App::render_files_page(bool save) { std::string App::render_files(bool layouts, bool save) { if (files_mode_ != menu_) files_begin(menu_); if (!layouts && page_native()) return render_files_page(save); + if (!layouts && !save && scene_ == "main") return render_files_pad(); std::string entries; const auto row = [&](const std::string &action, const std::string &id, const std::string &label, const std::string &subtitle, bool selected, const std::string &identity, bool fresh = false) { const auto icon = fresh ? "plus" : id == "standard" ? "grid" : layouts ? "image" : "save"; diff --git a/src/modern/ui/front_controls.inc b/src/modern/ui/front_controls.inc index d4036b1..e137d64 100644 --- a/src/modern/ui/front_controls.inc +++ b/src/modern/ui/front_controls.inc @@ -153,7 +153,7 @@ void App::front_after_render() { if (!front_dialog_.empty()) { Rml::ElementList behind; doc_->QuerySelectorAll( - behind, ".front-mod-content button,.front-mod-window>.titlebar button"); + behind, ".es-paper button"); for (auto *control : behind) { control->SetAttribute("disabled", true); control->SetProperty("pointer-events", "none"); @@ -394,10 +394,10 @@ bool App::front_event(Rml::Event &event) { } if (key == Rml::Input::KI_TAB) { Rml::ElementList controls; - auto *region = scene_ == "main" ? doc_->QuerySelector(".main-options") + auto *region = scene_ == "main" ? doc_->QuerySelector(".es-menu") : !front_dialog_.empty() - ? doc_->QuerySelector(".front-dialog") - : doc_->QuerySelector(".front-mod-window"); + ? doc_->QuerySelector(".es-dlg") + : doc_->QuerySelector(".es-paper"); if (region) region->QuerySelectorAll(controls, "button,input,select"); std::erase_if(controls, [](auto *node) { @@ -421,7 +421,7 @@ bool App::front_event(Rml::Event &event) { key == Rml::Input::KI_HOME || key == Rml::Input::KI_END)) { if (scene_ == "main") { Rml::ElementList options; - doc_->QuerySelectorAll(options, ".main-options button"); + doc_->QuerySelectorAll(options, ".es-menu button"); std::erase_if(options, [](auto *n) { return n->HasAttribute("disabled"); }); if (!options.empty()) { @@ -439,7 +439,7 @@ bool App::front_event(Rml::Event &event) { event.StopImmediatePropagation(); return true; } - if (target->IsClassSet("front-mod-entry")) { + if (target->IsClassSet("es-li")) { size_t index = 0; for (size_t i = 0; i < front_snapshot_.entries.size(); ++i) if (front_snapshot_.entries[i].id == selected_mod_) diff --git a/src/modern/ui/front_screens.inc b/src/modern/ui/front_screens.inc index 19d6edf..4805b9e 100644 --- a/src/modern/ui/front_screens.inc +++ b/src/modern/ui/front_screens.inc @@ -18,93 +18,64 @@ std::string App::front_size(uint64_t bytes) const { return number(int64_t(tenths / 10)) + (tenths % 10 ? "," + std::to_string(tenths % 10) : "") + " MiB"; } +// A length of the entry's design in dp: the table is drawn 1672 units across. +std::string App::es(double units) { return scalar(units * kEntryUnit) + "dp"; } +// The table with the pad on it; `over` lies above the pad (a note that asks something). +std::string App::entry_stage(const std::string &paper, const std::string &over) { + return "
" + (gui_.contains("entry.table") ? img("entry.table", 3840, 2160, false, true, 2048) : std::string()) + + "
" + paper + "
" + over + "
"; +} +// What is written on the pad: a small line, the heading, a rule, the body and the buttons at +// its foot. `right` stands beside the heading; without it the paper clip keeps its room. +std::string App::entry_sheet(const std::string &kicker, const std::string &title, const std::string &body, const std::string &foot, const std::string &right) { + return "
" + esc(pg_upper(kicker)) + "

" + esc(title) + "

" + + (right.empty() ? std::string("") : right) + "
" + body + (foot.empty() ? std::string() : ""); +} +std::string App::entry_pad(const std::string &kicker, const std::string &title, const std::string &body, const std::string &foot, const std::string &right, const std::string &over) { + return entry_stage(entry_sheet(kicker, title, body, foot, right), over); +} std::string App::main_menu() { const auto *active = mod(active_mod_); const bool available = active && active->error.empty(); - std::string out; - if (gui_.contains("menu.club-office")) - out = "
" + - img("menu.club-office", 3840, 2160, false, true, 2048) + "
"; - out += "
Aktive Mod" + - esc(label) + "
v" + - std::string(kOpenBmhVersion) + (config_.preview_only ? " · UI-Demo" : " · Entwicklung") + "
"; - return out; + const auto label = front_external_override_ && world_ ? world_->title() : available ? active->name : "Keine Mod aktiviert"; + const std::string ask = front_quit_ ? "
Das Spiel wirklich beenden?
" + + pg_button("front-quit-no", "Abbrechen", "sm", "id=\"front-quit-no\"") + pg_button("front-quit-yes", "Beenden", "primary sm", "id=\"front-quit-yes\"") + "
" + : std::string(); + return entry_stage("

Dreierpack Manager

" + ask + "Aktive Mod" + esc(label) + "Version " + + std::string(kOpenBmhVersion) + (config_.preview_only ? " · UI-Demo" : " · Entwicklung") + "
"); } std::string App::front_mod_details() { const auto *entry = front_selected(); if (!entry) - return "

Noch keine Mods " - "installiert

Importiere einen Originalordner oder ein " - "OpenBMH-Paket.

"; + return "

Noch keine Mods installiert

Importiere einen Originalordner oder ein OpenBMH-Paket.
"; const bool active = entry->active && !front_external_override_; - const auto provenance = entry->description.empty() ? front_source_name(*entry) - : entry->description; - std::string out = - "
" + - img("background", 1360, 360, false, true, 1600) + - "OpenBMH

" + - esc(provenance) + "

" + esc(entry->name) + - "

" + - (active ? "Aktiv" - : entry->valid() ? "Installiert" - : "Fehlerhaft") + - "
"; + const auto provenance = entry->description.empty() ? front_source_name(*entry) : entry->description; + std::string out = "
" + esc(pg_upper(active ? "Aktiv" : entry->valid() ? "Installiert" : "Fehlerhaft")) + "

" + esc(entry->name) + "

" + esc(provenance) + "
"; const std::vector> fields = { {"Art", entry->type}, {"Herkunft", front_source_name(*entry)}, {"Version", entry->version}, - {"Inhalt", std::to_string(entry->file_count) + - (entry->file_count == 1 ? " Datei" : " Dateien") + " · " + - front_size(entry->bytes)}}; - for (const auto &[label, value] : fields) - out += "
" + esc(label) + "" + esc(value) + - "
"; + {"Inhalt", std::to_string(entry->file_count) + (entry->file_count == 1 ? " Datei" : " Dateien") + " · " + front_size(entry->bytes)}}; + for (const auto &[label, value] : fields) out += "
" + esc(label) + "" + esc(value) + "
"; out += "
"; - if (!entry->valid()) - out += "

" + esc(entry->error) + "

"; + if (!entry->valid()) out += "" + esc(entry->error) + ""; const auto *current = mod(active_mod_); - out += - "

" + - esc(active ? "Diese Mod ist für das nächste Spiel ausgewählt." - : current ? "Aktivieren ersetzt die Auswahl „" + current->name + "“." - : "Aktiviere diese Mod für das nächste Spiel.") + - "

"; - return out + - btn("mod-activate", active ? "Aktiv" : "Aktivieren", - "front-mod-activate", - "id=\"mod-activate\" " + - std::string(active || !entry->valid() || front_busy_ - ? "disabled" - : "")) + - "
"; + out += "" + + esc(active ? "Diese Mod ist für das nächste Spiel ausgewählt." : current ? "Aktivieren ersetzt die Auswahl „" + current->name + "“." : "Aktiviere diese Mod für das nächste Spiel.") + "
"; + return out + pg_button("mod-activate", active ? "Aktiv" : "Aktivieren", "primary sm", "id=\"mod-activate\" " + std::string(active || !entry->valid() || front_busy_ ? "disabled=\"disabled\"" : "")) + "
"; } std::string App::front_modal() { if (front_dialog_.empty()) @@ -112,150 +83,91 @@ std::string App::front_modal() { std::string heading, body, buttons; if (front_dialog_ == "choice") { heading = "Mod importieren"; - body = "

Wähle einen Originalordner oder einen Export im " - "OpenBMH-Format.

"; + body = "

Wähle einen Originalordner oder einen Export im OpenBMH-Format.

"; const std::array, 3> choices{ - {{{"original", "BMH / Football Limited", - "Originalordner mit BMH.EXE oder FLTD.EXE"}}, - {{"package", "OpenBMH-Paket", - "Weltpaket im neuen Format · .obw oder .zip"}}, - {{"folder", "OpenBMH-Exportordner", - "Entpackte Welt oder Mod-Ordner mit content.obw"}}}}; + {{{"original", "BMH / Football Limited", "Originalordner mit BMH.EXE oder FLTD.EXE"}}, + {{"package", "OpenBMH-Paket", "Weltpaket im neuen Format · .obw oder .zip"}}, + {{"folder", "OpenBMH-Exportordner", "Entpackte Welt oder Mod-Ordner mit content.obw"}}}}; for (const auto &c : choices) - body += btn( - "front-pick", - "" + std::string(c[1]) + "" + c[2] + "", - "front-import-choice", "data-id=\"" + std::string(c[0]) + "\""); - body += "
"; - buttons = btn("front-dismiss", "Abbrechen"); + body += btn("front-pick", "" + std::string(c[1]) + "" + c[2] + "", "es-choice", "data-id=\"" + std::string(c[0]) + "\""); + buttons = pg_button("front-dismiss", "Abbrechen"); } else if (front_dialog_ == "name" || front_dialog_ == "rename") { const bool importing = front_dialog_ == "name"; heading = importing ? "Mod übernehmen" : "Mod umbenennen"; - body = ""; + body = "
BEZEICHNUNG
"; if (importing && front_plan_) { const auto &m = front_plan_->metadata; - body += - "

" + esc(m.description) + " · " + - esc(m.type) + "
" + std::to_string(m.file_count) + - (m.file_count == 1 ? " Datei" : " Dateien") + " · " + - front_size(m.bytes) + "

" + - std::string(m.type == "Classic" - ? "Der vorhandene OpenBMH-Importer konvertiert die " - "Originaldaten in ein eigenständiges Classic-Paket." - : "Das geprüfte Weltpaket wird in deine " - "Mod-Bibliothek übernommen.") + - " Anschließend kannst du die Mod aktivieren.

"; + body += "

" + esc(m.description) + " · " + esc(m.type) + " · " + std::to_string(m.file_count) + (m.file_count == 1 ? " Datei" : " Dateien") + " · " + front_size(m.bytes) + "

" + + std::string(m.type == "Classic" ? "Der vorhandene OpenBMH-Importer konvertiert die Originaldaten in ein eigenständiges Classic-Paket." + : "Das geprüfte Weltpaket wird in deine Mod-Bibliothek übernommen.") + + " Anschließend kannst du die Mod aktivieren.

"; } - body += "

" + - esc(front_name_error_) + "

"; - buttons = btn("front-dismiss", "Abbrechen") + - btn("front-name-confirm", - importing ? "Importieren" : "Umbenennen", "primary", - "id=\"front-name-confirm\" " + - std::string(front_name_error_.empty() ? "" : "disabled")); + body += "" + esc(front_name_error_) + ""; + buttons = pg_button("front-dismiss", "Abbrechen") + + pg_button("front-name-confirm", importing ? "Importieren" : "Umbenennen", "primary", "id=\"front-name-confirm\" " + std::string(front_name_error_.empty() ? "" : "disabled=\"disabled\"")); } else if (front_dialog_ == "delete") { heading = "Mod löschen?"; - body = "

„" + esc(front_target_ ? front_target_->name : "") + - "“ wirklich aus der lokalen Bibliothek entfernen?

"; - if (front_target_ && front_target_->active) - body += "

Danach ist keine Mod aktiviert. " - "Wähle eine andere Mod für das nächste neue Spiel.

"; - body += "

Persönliche Spielstände und " - "Desktopansichten bleiben erhalten.

"; - buttons = btn("front-dismiss", "Abbrechen") + - btn("front-delete-confirm", "Löschen", "primary"); + body = "

„" + esc(front_target_ ? front_target_->name : "") + "“ wirklich aus der lokalen Bibliothek entfernen?

"; + if (front_target_ && front_target_->active) body += "

Danach ist keine Mod aktiviert. Wähle eine andere Mod für das nächste neue Spiel.

"; + body += "

Persönliche Spielstände bleiben erhalten.

"; + buttons = pg_button("front-dismiss", "Abbrechen") + pg_button("front-delete-confirm", "Löschen", "primary"); } else { heading = "Vorgang nicht möglich"; body = "

" + esc(front_error_) + "

"; - buttons = btn("front-dismiss", "Verstanden"); + buttons = pg_button("front-dismiss", "Verstanden"); } - return "

" + - esc(heading) + "

" + body + "
" + buttons + - "
"; + return "

" + esc(heading) + "

" + body + "
" + buttons + "
"; } std::string App::mods_page() { std::string rows; for (size_t i = 0; i < front_snapshot_.entries.size(); ++i) { const auto &entry = front_snapshot_.entries[i]; - const bool active = entry.active && !front_external_override_; - rows += btn( - "mod-select", - "" + esc(entry.name) + - "" + - (active - ? "Aktiv" - : "" + esc(entry.valid() ? entry.source : "Fehlerhaft") + - "") + - "" + esc(entry.type) + - "", - "front-mod-entry " + - std::string(entry.id == selected_mod_ ? "selected" : ""), - "id=\"mod-entry-" + std::to_string(i) + - "\" role=\"option\" aria-selected=\"" + - (entry.id == selected_mod_ ? "true" : "false") + "\" data-id=\"" + - esc(entry.id) + "\" " + (front_busy_ ? "disabled" : "")); + const bool active = entry.active && !front_external_override_, chosen = entry.id == selected_mod_; + rows += btn("mod-select", "" + esc(entry.name) + "" + esc(active ? "Aktiv" : entry.valid() ? entry.source : "Fehlerhaft") + " · " + esc(entry.type) + "", std::string("es-li") + (chosen ? " sel" : ""), + "id=\"mod-entry-" + std::to_string(i) + "\" role=\"option\" aria-selected=\"" + (chosen ? "true" : "false") + "\" data-id=\"" + esc(entry.id) + "\" " + (front_busy_ ? "disabled=\"disabled\"" : "")); } - if (rows.empty()) - rows = "

Noch keine Mods vorhanden.

"; - const auto tabs = - btn("front-tab", - "Installiert · " + std::to_string(front_snapshot_.entries.size()), - front_tab_ == "installed" ? "active" : "", - "id=\"mod-installed\" role=\"tab\" aria-selected=\"" + - std::string(front_tab_ == "installed" ? "true" : "false") + - "\" data-id=\"installed\" " + (front_busy_ ? "disabled" : "")) + - btn("front-tab", "Downloads", front_tab_ == "downloads" ? "active" : "", - "id=\"mod-downloads\" role=\"tab\" aria-selected=\"" + - std::string(front_tab_ == "downloads" ? "true" : "false") + - "\" data-id=\"downloads\" " + (front_busy_ ? "disabled" : "")); - const auto pane = - front_tab_ == "installed" - ? "
ModArt
" + - rows + "
" + front_mod_details() + "
" - : "
" + - img("icon.download", 180, 180) + - "

Neue Welten entdecken

Hier findest du später Mods " - "aus der zentralen OpenBMH-Datenbank.

" + - btn("front-noop", "Downloads demnächst", {}, "disabled") + - "
"; - const bool selected = front_selected() != nullptr, - enabled = !front_busy_ && selected && front_tab_ == "installed"; - const auto feedback = front_busy_ ? front_feedback_ - : !front_feedback_.empty() ? front_feedback_ - : !front_snapshot_.error.empty() - ? front_snapshot_.error - : "Es kann genau eine Mod aktiv sein."; - const auto body = - "
" + - pane + - "

" + - esc(feedback) + "

" + - btn("front-import", "Importieren", {}, - "id=\"front-import-button\" " + - std::string(front_busy_ ? "disabled" : "")) + - btn("mod-rename", "Umbenennen", {}, - "id=\"mod-rename-button\" " + - std::string(enabled ? "" : "disabled")) + - btn("mod-remove", "Löschen", {}, - "id=\"mod-remove-button\" " + - std::string(enabled ? "" : "disabled")) + - "
"; - return main_menu() + - "
" + - btn("front-home", "×", "close", - "id=\"window-close\" aria-label=\"Mod-Verwaltung schließen\" " + - std::string(front_busy_ ? "disabled" : "")) + - "

Mod

" + body + front_modal() + "
"; + if (rows.empty()) rows = "Noch keine Mods vorhanden."; + const auto tab = [&](const char *id, const std::string &label) { + const bool on = front_tab_ == id; + return btn("front-tab", "" + label + "", on ? "on" : "", "id=\"mod-" + std::string(id) + "\" role=\"tab\" aria-selected=\"" + (on ? "true" : "false") + "\" data-id=\"" + id + "\" " + (front_busy_ ? "disabled=\"disabled\"" : "")); + }; + const auto tabs = ""; + const auto pane = front_tab_ == "installed" + ? "
" + rows + "
" + + front_mod_details() + "
" + : std::string("
Downloads folgen in einer späteren Version.
"); + const bool selected = front_selected() != nullptr, enabled = !front_busy_ && selected && front_tab_ == "installed"; + const auto feedback = front_busy_ ? front_feedback_ : !front_feedback_.empty() ? front_feedback_ : !front_snapshot_.error.empty() ? front_snapshot_.error : "Es kann genau eine Mod aktiv sein."; + const std::string off = "disabled=\"disabled\""; + const auto foot = (front_tab_ == "installed" ? pg_button("front-import", "Importieren", "sm", "id=\"front-import-button\" " + (front_busy_ ? off : std::string())) + + pg_button("mod-rename", "Umbenennen", "sm", "id=\"mod-rename-button\" " + (enabled ? std::string() : off)) + + pg_button("mod-remove", "Löschen", "sm", "id=\"mod-remove-button\" " + (enabled ? std::string() : off)) + : std::string()) + + "" + esc(feedback) + "" + pg_button("front-home", "Zurück", "primary", "id=\"window-close\" " + (front_busy_ ? off : std::string())); + return entry_pad("Hauptmenü", "Mod", pane, foot, tabs, front_modal()); +} +// Spiel laden from the main menu: the saves on the left, the chosen one on the right. +std::string App::render_files_pad() { + std::string entries; + for (size_t i = 0; i < files_rows_.size(); ++i) { + const auto &entry = files_rows_[i]; + const bool chosen = files_selected_ == entry.id; + entries += btn("files-select", "" + esc(entry.name) + "" + esc(entry.valid() ? "Gespeichert am " + files_when(entry.created) : "Datei kann nicht geöffnet werden") + "", std::string("es-li") + (chosen ? " sel" : ""), + "id=\"files-entry-" + std::to_string(i) + "\" role=\"option\" data-id=\"" + esc(entry.id) + "\" data-file-row=\"true\" aria-selected=\"" + (chosen ? "true" : "false") + "\""); + } + if (entries.empty()) entries = "" + std::string(files_native_ && engine_files_busy_ ? "Spielstände werden geladen …" : "Noch keine Spielstände vorhanden.") + ""; + std::string details; + try { details = files_page_details(false); } + catch (const std::exception &e) { details = "
Datei nicht verfügbar" + esc(e.what()) + "
"; } + const bool selected = files_entry_ && files_entry_->valid(); + const std::string off = "disabled=\"disabled\""; + const auto feedback = files_feedback_.empty() ? std::string("Klick oder Pfeiltasten wählen einen Eintrag.") : files_feedback_; + return entry_pad("Hauptmenü", "Spiel laden", + "
" + entries + + "
" + details + "
", + pg_button("files-import", "Importieren", "sm") + pg_button("files-rename", "Umbenennen", "sm", selected ? std::string() : off) + + pg_button("files-delete", "Löschen", "sm", files_entry_ && !files_entry_->token.empty() ? std::string() : off) + "" + esc(feedback) + "" + + pg_button("files-close", "Abbrechen") + pg_button("files-load", "Laden", "primary", "id=\"files-confirm\" " + (selected ? std::string() : off))); } Json App::front_snapshot_view() const { diff --git a/src/modern/ui/front_state.inc b/src/modern/ui/front_state.inc index 828974d..9c9bd16 100644 --- a/src/modern/ui/front_state.inc +++ b/src/modern/ui/front_state.inc @@ -18,6 +18,7 @@ std::string front_selection_token_; std::future front_job_; std::shared_ptr front_progress_; bool front_busy_ = false, front_external_override_ = false; +bool front_quit_ = false; // the main menu asks whether to leave float front_list_scroll_ = 0; bool front_restore_scroll_ = false, front_reveal_selection_ = false; fs::path front_library_root() const; diff --git a/src/modern/ui/notebook.inc b/src/modern/ui/notebook.inc index e3a8033..e63210d 100644 --- a/src/modern/ui/notebook.inc +++ b/src/modern/ui/notebook.inc @@ -148,8 +148,8 @@ std::string App::notebook_shell(const std::function & // the leather cover with its seam, the ribbon, the stack of sheets out += "
" + picture(leather, 3281, 2070, true) + "
" + svg("nb-seam", 1440, 902, "", 2400) + "
"; - out += "
" + svg("nb-ribbon", 20, 96, "", 200) + "
"; + out += btn("nb-home", svg("nb-ribbon", 20, 96, "", 200), "nb-ribbon", "id=\"nb-home\" aria-label=\"Zurück ins Hauptmenü\" title=\"Zurück ins Hauptmenü\""); for (int sheet = 4; sheet >= 0; --sheet) out += "
"; // the categories: markers that stick out at the left edge static constexpr std::array tones{"a3", "s3", "a2", "s4", "a4", "n3", "s2", "a5", "s5"}; diff --git a/src/modern/ui/settings_screens.inc b/src/modern/ui/settings_screens.inc index 38b6a77..c7645e9 100644 --- a/src/modern/ui/settings_screens.inc +++ b/src/modern/ui/settings_screens.inc @@ -200,6 +200,9 @@ std::string App::render_settings() { begin_settings(); // in a career the settings are a page of the notebook; from the main menu the older sheet const bool page = page_native(); + // from the main menu only the sound is set, on the pad of the entry + const bool pad = scene_ == "main"; + if (pad) settings_category_ = "sound"; settings_remember_scroll(); const auto &p = settings_draft_.at("global"); std::string nav, pane; @@ -410,6 +413,12 @@ std::string App::render_settings() { return out + "
" + pane + "
"; } + if (pad) + return entry_pad("Hauptmenü", "Einstellungen", + "
" + pane + "Der Ton wird hier im Hauptmenü eingestellt. Gestaltung und Spieloptionen findest du im Spiel unter Optionen.
", + "" + pg_button("settings-cancel", "Abbrechen", "", "id=\"settings-cancel\"") + + pg_button("settings-apply", "Anwenden", "primary", "id=\"settings-apply\"")); return "