Use actual league names in settings groups and search (by Codex)
This commit is contained in:
1 parent
3a1242650f
commit
f9f950fc7f
7 files changed
+88
-4
No files matched your search
@@ -22,7 +22,19 @@ cli::Json ui_settings_data(const ModernState &state, const LeImage &exe,
|
||||
using A = J::Array;
|
||||
const auto view =
|
||||
ui::settings_from_game(state, manager, revision, exe, sound);
|
||||
A cells, automation, formations;
|
||||
A cells, automation, formations, league_groups;
|
||||
// Source result switches A-E address the five domestic league indices.
|
||||
// Keep that binding explicit; UI labels must not infer it from league names.
|
||||
for (size_t i = 0; i < 5; ++i) {
|
||||
const bool known = i < state.world_league_id.size() &&
|
||||
i < state.world_league_name.size() &&
|
||||
!state.world_league_id[i].empty() &&
|
||||
!state.world_league_name[i].empty();
|
||||
league_groups.push_back(O{
|
||||
{"row", std::string(1, char('A' + i))},
|
||||
{"competitionId", known ? J(state.world_league_id[i]) : J(nullptr)},
|
||||
{"name", known ? J(state.world_league_name[i]) : J(nullptr)}});
|
||||
}
|
||||
for (size_t i = 0; i < view.cells.size(); ++i) {
|
||||
const int column = int(i % 9), row = int(i / 9), raw = view.cells[i];
|
||||
ui::SettingsWriteRequest request;
|
||||
@@ -90,6 +102,7 @@ cli::Json ui_settings_data(const ModernState &state, const LeImage &exe,
|
||||
{"editable", available}});
|
||||
}
|
||||
return O{{"kind", "settings"},
|
||||
{"leagueGroups", std::move(league_groups)},
|
||||
{"cells", std::move(cells)},
|
||||
{"automation", std::move(automation)},
|
||||
{"formations", std::move(formations)},
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_settings.hpp"
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include "modern/ui/settings_presentation.hpp"
|
||||
#include <set>
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
@@ -21,6 +22,32 @@ Json engine_settings_projection(const Json &bundle) {
|
||||
require_settings(read.at("meta").at(key) == meta.at(key),
|
||||
"Die Einstellungen sind veraltet.");
|
||||
const auto &data = read.at("data");
|
||||
require_settings(data.at("leagueGroups").is_array() &&
|
||||
data.at("leagueGroups").size() == 5,
|
||||
"Unvollständige Wettbewerbszuordnung.");
|
||||
Json titles = Json::object();
|
||||
std::set<std::string> leagues;
|
||||
for (size_t i = 0; i < 5; ++i) {
|
||||
const auto &group = data.at("leagueGroups")[i];
|
||||
const auto row = std::string(1, char('A' + i));
|
||||
const auto &id = group.at("competitionId"), &name = group.at("name");
|
||||
require_settings(group.at("row") == row &&
|
||||
((id.is_null() && name.is_null()) ||
|
||||
(id.is_string() && !id.get<std::string>().empty() &&
|
||||
name.is_string() && !name.get<std::string>().empty() &&
|
||||
leagues.insert(id.get<std::string>()).second)),
|
||||
"Ungültige Wettbewerbszuordnung.");
|
||||
titles[row] = name.is_null() ? "Wettbewerb " + row : name.get<std::string>();
|
||||
}
|
||||
Json catalogue = live_settings_catalogue();
|
||||
for (auto &group : catalogue.at("groups"))
|
||||
if (group.contains("competitions"))
|
||||
for (auto &competition : group["competitions"]) {
|
||||
const auto code = competition.at("options").at(0).at("code").get<std::string>();
|
||||
const auto row = code.substr(0, 1);
|
||||
if (titles.contains(row))
|
||||
competition["title"] = titles.at(row);
|
||||
}
|
||||
require_settings(data.at("cells").is_array() &&
|
||||
data.at("cells").size() == 180,
|
||||
"Unvollständige Spieloptionen.");
|
||||
@@ -89,6 +116,7 @@ Json engine_settings_projection(const Json &bundle) {
|
||||
{"formation", data.at("formation")}}},
|
||||
{"cells", capabilities},
|
||||
{"automation", auto_caps},
|
||||
{"catalogue", std::move(catalogue)},
|
||||
{"formations", data.at("formations")}};
|
||||
}
|
||||
Json engine_settings_command(const Json &bundle, const Json &draft,
|
||||
|
||||
@@ -127,6 +127,10 @@ std::string App::settings_option(const Json &option) const {
|
||||
return settings_row(id, option.at("label").get<std::string>(),
|
||||
option.value("help", ""), control);
|
||||
}
|
||||
const Json &App::settings_catalogue_view() const {
|
||||
return engine_mode_ ? engine_settings_value_.at("catalogue")
|
||||
: live_settings_catalogue();
|
||||
}
|
||||
std::string App::render_settings_groups(int *count) const {
|
||||
std::istringstream words(settings_search_key(settings_query_));
|
||||
std::vector<std::string> terms;
|
||||
@@ -134,7 +138,7 @@ std::string App::render_settings_groups(int *count) const {
|
||||
terms.push_back(word);
|
||||
int found = 0;
|
||||
std::string out;
|
||||
for (const auto &group : live_settings_catalogue().at("groups")) {
|
||||
for (const auto &group : settings_catalogue_view().at("groups")) {
|
||||
std::string rows;
|
||||
const auto matches = [&](const Json &o, const std::string &competition) {
|
||||
const auto text = settings_search_key(
|
||||
@@ -339,7 +343,7 @@ std::string App::render_settings() {
|
||||
pane += "</div>";
|
||||
} else {
|
||||
std::vector<std::pair<std::string, std::string>> groups;
|
||||
for (const auto &g : live_settings_catalogue().at("groups"))
|
||||
for (const auto &g : settings_catalogue_view().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>" +
|
||||
|
||||
@@ -16,6 +16,7 @@ void begin_settings();
|
||||
bool settings_global_only() const;
|
||||
bool settings_dirty() const;
|
||||
bool settings_valid() const;
|
||||
const Json &settings_catalogue_view() 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;
|
||||
|
||||
Reference in new issue
Block a user