Complete Modern desktop widgets and file libraries (by Codex)
This commit is contained in:
1 parent
db89d889f7
commit
31bcf93205
43 files changed
+3134
-484
No files matched your search
+27
-238
@@ -1,210 +1,49 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Included in the native UI implementation's anonymous namespace.
|
||||
void App::init_desktop() {
|
||||
if (!desktop_.contains("objects")) {
|
||||
desktop_ = default_desktop();
|
||||
saved_desktop_ = desktop_;
|
||||
if(!desktop_.contains("objects"))desktop_=default_desktop();
|
||||
if(!working_desktop_initialized_){
|
||||
working_desktop_initialized_=true;
|
||||
const auto file=user_dir()/"working-desktop.json";
|
||||
if(config_.state.empty()&&fs::is_regular_file(file)){
|
||||
try{auto next=Json::parse(editor::read_file(file));if(!migrate_desktop(next))throw editor::Error("Ungültige Desktopanordnung.");desktop_=std::move(next);}
|
||||
catch(const std::exception &){message("Die gespeicherte Desktopanordnung konnte nicht geladen werden. Die Standardansicht wird verwendet.");}
|
||||
}
|
||||
working_desktop_base_=desktop_;saved_desktop_=desktop_;
|
||||
}
|
||||
}
|
||||
|
||||
std::string App::widget(const std::string &id, const Json &o) {
|
||||
const auto s = snap();
|
||||
const auto *own = club(s);
|
||||
const auto w = o.value("w", 472), h = o.value("h", 472);
|
||||
const auto row = world_->clubs(own ? own->value("competition", "") : league_);
|
||||
const auto *opponent =
|
||||
row.size() > 1 ? (row[0] == own ? row[1] : row[0]) : own;
|
||||
auto heading = [&](const std::string &name) {
|
||||
return "<div class=\"card-heading\">" + esc(name) + "</div>";
|
||||
};
|
||||
if (id == "calendar") {
|
||||
const auto date = s.state.value("date", std::string("2026-07-01"));
|
||||
const auto year = date.substr(0, 4), day = date.substr(8, 2);
|
||||
const int month = std::stoi(date.substr(5, 2));
|
||||
const std::array<const char *, 12> months = {
|
||||
"Januar", "Februar", "März", "April", "Mai", "Juni",
|
||||
"Juli", "August", "September", "Oktober", "November", "Dezember"};
|
||||
return "<div "
|
||||
"style=\"height:116dp;background-color:#a45254;color:white;text-"
|
||||
"align:center;padding-top:30dp;font-size:38dp;\">" +
|
||||
std::string(months[size_t(std::clamp(month, 1, 12) - 1)]) + " " +
|
||||
year +
|
||||
"</div><div class=\"center\" style=\"padding-top:66dp;\"><p "
|
||||
"class=\"muted\" style=\"font-size:38dp;\">Saisonvorbereitung</p><p "
|
||||
"style=\"font-size:240dp;line-height:1.1;\">" +
|
||||
std::to_string(std::stoi(day)) + "</p><p class=\"small\">" +
|
||||
esc(date) + "</p></div>" +
|
||||
btn("open:calendar",
|
||||
glyph("calendar", 32) +
|
||||
"<span>Kalender öffnen</span><span "
|
||||
"class=\"calendar-arrow\">" +
|
||||
glyph("arrow-diagonal", 30) + "</span>",
|
||||
"card-button calendar-link",
|
||||
"style=\"left:0;bottom:0;width:100%;height:90dp;border-top:2dp "
|
||||
"var(--border);font-size:25dp;color:var(--muted);\"");
|
||||
}
|
||||
if (id == "account") {
|
||||
if (h < 300)
|
||||
return "<div style=\"padding:18dp 28dp;\"><span "
|
||||
"class=\"small\">Konto</span><p "
|
||||
"style=\"font-size:46dp;color:var(--accent);\">" +
|
||||
cash(s.state.value("cash", int64_t(0))) + "</p></div>" +
|
||||
btn("ticket",
|
||||
"Eintritt " +
|
||||
std::to_string(s.state.value("ticket", 13)) + " €",
|
||||
"card-button",
|
||||
"id=\"desktop-ticket\" data-interactive=\"true\" "
|
||||
"style=\"right:20dp;top:45dp;font-size:32dp;\"");
|
||||
return heading("Vereinskasse") +
|
||||
"<div style=\"position:absolute;left:34dp;top:90dp;\"><p "
|
||||
"class=\"small\">Guthaben</p><p style=\"font-size:" +
|
||||
std::to_string(w < 600 ? 48 : 65) +
|
||||
"dp;letter-spacing:-2dp;color:var(--accent);margin-top:10dp;\">" +
|
||||
cash(s.state.value("cash", int64_t(0))) +
|
||||
"</p></div><div "
|
||||
"style=\"position:absolute;left:0;right:0;bottom:0;height:132dp;"
|
||||
"border-top:2dp var(--border);padding:22dp 34dp;\"><span "
|
||||
"class=\"small\">Sparbuch</span><p style=\"font-size:34dp;\">" +
|
||||
cash(s.state.value("deposit", int64_t(0))) + "</p></div>" +
|
||||
btn("ticket",
|
||||
"<span class=\"small\">Eintritt</span><br/>" +
|
||||
std::to_string(s.state.value("ticket", 13)) + " € ›",
|
||||
"card-button",
|
||||
"id=\"desktop-ticket\" data-interactive=\"true\" "
|
||||
"style=\"right:30dp;bottom:20dp;min-width:200dp;padding:12dp "
|
||||
"24dp;font-size:34dp;background-color:var(--soft);border-radius:"
|
||||
"18dp;\"");
|
||||
}
|
||||
if (id == "portrait")
|
||||
return img(std::string(manager(s).value("portrait_style", "photo") ==
|
||||
"painted"
|
||||
? "manager-painted."
|
||||
: "manager.") +
|
||||
std::to_string(manager(s).value("portrait", 0)),
|
||||
w, h, false, true, 800) +
|
||||
"<div "
|
||||
"style=\"position:absolute;left:0;right:0;bottom:0;padding:50dp "
|
||||
"30dp "
|
||||
"28dp;decorator:linear-gradient(0deg,#0d1928ed,#0d192800);color:#"
|
||||
"eff4f8;\"><small>Manager</small><p style=\"font-size:34dp;\">" +
|
||||
esc(manager(s).value("name", "")) + "</p></div>";
|
||||
if (id == "crest" || id == "opponent-crest")
|
||||
return "<div class=\"center\" style=\"padding:35dp 30dp;\">" +
|
||||
crest(id == "crest" ? own : opponent, std::min(w - 60, h - 150)) +
|
||||
"</div><div "
|
||||
"style=\"position:absolute;left:15dp;right:15dp;bottom:28dp;text-"
|
||||
"align:center;font-size:28dp;\"><p class=\"small\">" +
|
||||
(id == "crest" ? "Dein Verein" : "Nächster Gegner") + "</p><p>" +
|
||||
esc(world_->name(*(id == "crest" ? own : opponent))) + "</p></div>";
|
||||
if (id == "competition")
|
||||
return heading("Nächste Begegnung") +
|
||||
"<div class=\"row\" "
|
||||
"style=\"position:absolute;left:30dp;right:30dp;top:180dp;justify-"
|
||||
"content:space-around;text-align:center;\"><div>" +
|
||||
crest(own, 80) + "<p style=\"font-size:23dp;margin-top:14dp;\">" +
|
||||
esc(own ? world_->name(*own) : "") +
|
||||
"</p></div><div><p class=\"small\">Freundschaftsspiel</p><p "
|
||||
"style=\"font-size:54dp;\">19:00</p><p class=\"small\">Heim · "
|
||||
"Samstag</p></div><div>" +
|
||||
crest(opponent, 80) +
|
||||
"<p style=\"font-size:23dp;margin-top:14dp;\">" +
|
||||
esc(opponent ? world_->name(*opponent) : "") + "</p></div></div>";
|
||||
if (id == "warnings") {
|
||||
const std::array<const char *, 10> names = {
|
||||
"Aktiengewinn", "Kontostand", "Freie Werbeflächen",
|
||||
"Sondertraining", "Erschöpfung", "Startaufstellung",
|
||||
"Ersatzspieler", "Taktischer Einsatz", "Auslaufende Verträge",
|
||||
"Lizenz"};
|
||||
const std::array<const char *, 10> icons = {
|
||||
"chart", "coins", "shirt", "star", "heart",
|
||||
"person", "person", "chart", "save", "check"};
|
||||
const std::array<int, 8> wide_members = {0, 1, 2, 3, 5, 7, 8, 9};
|
||||
const bool wide = h < 300;
|
||||
const int columns = wide ? 8 : 5, count = wide ? 8 : 10;
|
||||
std::string out = heading("Vereinsstatus");
|
||||
for (int i = 0; i < count; ++i) {
|
||||
const int member = wide ? wide_members[size_t(i)] : i;
|
||||
const int cell_w = (w - 52) / columns;
|
||||
const int x = 26 + cell_w * (i % columns),
|
||||
y = wide ? 90 : 95 + (i / columns) * 175;
|
||||
out += "<div style=\"position:absolute;" +
|
||||
rect(x, y, cell_w, wide ? 110 : 160) +
|
||||
"\"><div style=\"position:absolute;left:" +
|
||||
std::to_string((cell_w - 64) / 2) +
|
||||
"dp;top:0;width:64dp;height:64dp;border:2dp "
|
||||
"#9ddbc653;border-radius:32dp;padding:12dp;background-color:" +
|
||||
std::string(member == 2 ? "#c57c67" : "#65a58d") + ";\">" +
|
||||
glyph(icons[size_t(member)], 36) + "</div>" +
|
||||
(wide ? ""
|
||||
: "<p class=\"center\" "
|
||||
"style=\"position:absolute;left:0;right:0;top:80dp;font-"
|
||||
"size:18dp;line-height:1.15;\">" +
|
||||
std::string(names[size_t(member)]) + "</p>") +
|
||||
"</div>";
|
||||
}
|
||||
return out;
|
||||
}
|
||||
if (id == "trash")
|
||||
return "<div class=\"center\" style=\"padding-top:35dp;\">" +
|
||||
glyph("trash", 100) +
|
||||
"</div><p class=\"center small\">Papierkorb</p>";
|
||||
if (id == "fans")
|
||||
return heading("Fan-Stimmung") +
|
||||
"<p class=\"center accent\" "
|
||||
"style=\"font-size:80dp;padding-top:85dp;\">" +
|
||||
std::to_string(s.state.value("fans", 67)) + " %</p>";
|
||||
if (id == "news")
|
||||
return render_news_widget(o);
|
||||
if (id == "results")
|
||||
return heading("Letzte sechs Spiele") +
|
||||
"<div class=\"row\" style=\"padding:100dp "
|
||||
"30dp;justify-content:space-around;font-size:40dp;\"><span>–</"
|
||||
"span><span>–</span><span>–</span><span>–</span><span>–</"
|
||||
"span><span>–</span></div>";
|
||||
if (id == "own-summary" || id == "opponent-summary")
|
||||
return heading(id == "own-summary" ? "Platz & Stärke · eigener Verein"
|
||||
: "Platz & Stärke · Gegner") +
|
||||
"<div class=\"row\" style=\"padding:80dp "
|
||||
"30dp;justify-content:space-around;font-size:56dp;\"><span>–</"
|
||||
"span><span>–</span></div>";
|
||||
const auto caption = id == "duels" ? "Direkter Vergleich"
|
||||
: id == "comparison-curve" ? "Tabellenplätze · Vergleich"
|
||||
: id == "own-curve" ? "Tabellenplatz · eigener Verein"
|
||||
: "Tabellenplatz · Gegner";
|
||||
return heading(caption) +
|
||||
"<div "
|
||||
"style=\"position:absolute;left:50dp;right:30dp;top:95dp;bottom:45dp;"
|
||||
"border-left:2dp var(--muted);border-bottom:2dp var(--muted);\"><p "
|
||||
"class=\"center muted\" "
|
||||
"style=\"padding-top:80dp;\">Saisonvorbereitung</p></div>";
|
||||
}
|
||||
std::string App::render_desktop() {
|
||||
init_desktop();
|
||||
const auto s = snap();
|
||||
widget_data_ = demo_desktop_widgets(*world_, s.state);
|
||||
const auto *c = club(s);
|
||||
std::string out =
|
||||
"<div class=\"info-bar\">" +
|
||||
"<div class=\"desktop-layer\"><div class=\"info-bar\">" +
|
||||
btn("desktop-context",
|
||||
crest(c, 82) + "<span><strong>" + esc(c ? world_->name(*c) : "") +
|
||||
"</strong><small>" + esc(manager(s).value("name", "")) +
|
||||
"</small></span>",
|
||||
"identity") +
|
||||
"<div class=\"info-date\">Saisonvorbereitung<small>" +
|
||||
esc(s.state.value("date", std::string())) +
|
||||
"identity", "id=\"desktop-identity\"") +
|
||||
"<div class=\"info-date\">" + std::string(widget_data_.at("matchday")==0?"Saisonvorbereitung":std::to_string(widget_data_.at("matchday").get<int>())+". Spieltag") + "<small>" +
|
||||
esc(widget_data_.at("season").get<std::string>()) +
|
||||
"</small></div><div class=\"info-cash\"><small>Guthaben</small><strong>" +
|
||||
cash(s.state.value("cash", int64_t(0))) + "</strong></div></div>";
|
||||
if(desktop_.value("grid",true))for(int row=0;row<7;++row)for(int col=0;col<15;++col)out+="<span class=\"desktop-grid-dot\" style=\"left:"+std::to_string(64+col*248)+"dp;top:"+std::to_string(224+row*248)+"dp;\"></span>";
|
||||
for (const auto &[id, o] : desktop_["objects"].items()) {
|
||||
if (!o.value("visible", false))
|
||||
continue;
|
||||
const auto style = rect(o.value("x", 0), o.value("y", 0), o.value("w", 224),
|
||||
o.value("h", 224));
|
||||
if (o.value("widget", false))
|
||||
out += "<div id=\"object-" + esc(id) + "\" data-object=\"" + esc(id) +
|
||||
"\" class=\"desktop-card\" style=\"" + style + "\">" +
|
||||
o.value("h", 224)) + "z-index:" + std::to_string(o.value("z", 1)) + ";";
|
||||
if (o.value("widget", false)) {
|
||||
std::string size="s",route;
|
||||
for(const auto &d:widget_catalogue())if(d.at("id")==id){route=d.value("route","");for(const auto &[key,span]:d.at("spans").items())if(o.at("w")==span[0].get<int>()*248-24&&o.at("h")==span[1].get<int>()*248-24)size=key;}
|
||||
out += "<div tabindex=\"0\" data-widget=\""+esc(id)+"\" data-size=\""+size+"\" data-pinned=\""+(o.value("pinned",true)?"true":"false")+"\" "+(route.empty()?"":"data-action=\"open:"+route+"\" ")+"id=\"object-" + esc(id) + "\" data-object=\"" + esc(id) +
|
||||
"\" class=\"desktop-card desk-card "+std::string(id=="trash"?"desk-utility":"")+"\" style=\"" + style + "\">" +
|
||||
widget(id, o) +
|
||||
(o.value("pinned", true) ? "<div class=\"pin-dot\"></div>" : "") +
|
||||
"</div>";
|
||||
else {
|
||||
} else {
|
||||
const auto route = id.substr(4);
|
||||
const std::array<std::string, 32> colors = {
|
||||
"#3d789b", "#375a83", "#477c73", "#42846b", "#a58a49", "#586ba0",
|
||||
@@ -226,12 +65,12 @@ std::string App::render_desktop() {
|
||||
"style=\"decorator:linear-gradient(140deg," +
|
||||
top + "," + bottom + ");\">" +
|
||||
img("button." + route, 146, 146, false, false, 256) +
|
||||
"</div><span class=\"app-name\">" + esc(title(route)) + "</span>" +
|
||||
"</div><span class=\"app-name\">" + esc(route=="transfer"?"Transfer":title(route)) + "</span>" +
|
||||
(o.value("pinned", true) ? "<div class=\"pin-dot\"></div>" : "") +
|
||||
"</button>";
|
||||
}
|
||||
}
|
||||
return out;
|
||||
return out + "</div>";
|
||||
}
|
||||
std::string App::render_newgame() {
|
||||
std::string body = "<h2>Grundeinstellungen</h2><p class=\"small\" "
|
||||
@@ -711,56 +550,9 @@ std::string App::render_camp() {
|
||||
btn("camp-remember", "Vormerken", "primary") + "</div></div>";
|
||||
return body;
|
||||
}
|
||||
std::string App::render_save(bool save) {
|
||||
const auto directory = user_dir() / "saves";
|
||||
std::string body = "<div class=\"panel list\" "
|
||||
"style=\"position:absolute;left:0;top:0;width:1120dp;"
|
||||
"bottom:145dp;padding:24dp;\">";
|
||||
if (save)
|
||||
body += btn("save-new", "Neuer Speicherstand", "choice",
|
||||
"style=\"width:100%;text-align:left;min-height:100dp;margin-"
|
||||
"bottom:14dp;\"");
|
||||
if (fs::exists(directory))
|
||||
for (const auto &file : fs::directory_iterator(directory))
|
||||
if (file.path().extension() == ".json") {
|
||||
const auto name = editor::utf8(file.path().stem());
|
||||
body += btn("save-select", esc(name),
|
||||
std::string("choice ") +
|
||||
(selections_["save"] == name ? "selected" : ""),
|
||||
"data-id=\"" + esc(name) +
|
||||
"\" "
|
||||
"style=\"width:100%;min-height:110dp;text-align:left;"
|
||||
"margin-bottom:14dp;\"");
|
||||
}
|
||||
body += "</div><div class=\"panel\" "
|
||||
"style=\"position:absolute;left:1160dp;right:0;top:0;bottom:145dp;"
|
||||
"padding:50dp;\"><h2>" +
|
||||
esc(selections_["save"].empty() ? "Speicherstand auswählen"
|
||||
: selections_["save"]) +
|
||||
"</h2>";
|
||||
const auto s = snap();
|
||||
body +=
|
||||
"<div style=\"margin:40dp 0;\">" + crest(club(s), 340) +
|
||||
"</div><div class=\"field-row\"><span>Saison</span><strong>" +
|
||||
esc(s.state.value("date", std::string()).substr(0, 4)) +
|
||||
"</strong></div><div "
|
||||
"class=\"field-row\"><span>Spieltag</span><strong>Saisonvorbereitung</"
|
||||
"strong></div><div class=\"field-row\"><span>Datum</span><strong>" +
|
||||
esc(s.state.value("date", std::string())) +
|
||||
"</strong></div><div "
|
||||
"class=\"field-row\"><span>Mitspieler</span><strong>" +
|
||||
std::to_string(s.state.at("managers").size()) + "</strong></div>";
|
||||
if (save && selections_["save"].empty())
|
||||
body += "<div class=\"field-row\"><label>Bezeichnung</label><input "
|
||||
"id=\"save-name\" value=\"Meine Karriere\"/></div>";
|
||||
return body + "</div><div class=\"bottom-controls\">" +
|
||||
btn("save-delete", "Löschen") + btn("save-rename", "Umbenennen") +
|
||||
btn("close", "Abbrechen") +
|
||||
btn(save ? "save-confirm" : "load-confirm",
|
||||
save ? "Speichern" : "Laden", "primary") +
|
||||
"</div>";
|
||||
}
|
||||
std::string App::render_menu(const std::string &key) {
|
||||
if(key=="view-save"||key=="view-load")return render_files(true,key=="view-save");
|
||||
if (key == "widgets" || key == "background" || key == "warning" || key == "quit") return render_widget_dialog(key);
|
||||
if (key == "news")
|
||||
return "<div class=\"fill\" style=\"z-index:100;\">" + render_news() + "</div>";
|
||||
std::string body;
|
||||
@@ -813,10 +605,7 @@ std::string App::render_menu(const std::string &key) {
|
||||
else if (key == "settings")
|
||||
body = render_settings();
|
||||
else if (key == "save" || key == "load")
|
||||
body = render_save(key == "save");
|
||||
else if (key == "widgets" || key == "view-save" || key == "view-load" ||
|
||||
key == "background")
|
||||
body = render_desktop_tools(key);
|
||||
body = render_files(false,key == "save");
|
||||
else
|
||||
throw editor::Error("Diese native Ansicht ist noch nicht verfügbar.");
|
||||
std::string heading = key == "postpone" ? "Spiel verlegen" : title(key);
|
||||
|
||||
Reference in new issue
Block a user