Skip to content

Fix legacy position population #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
in1tiate merged 3 commits into from
Jan 23, 2025
Merged

Fix legacy position population #1069

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23cae09
Reworked legacy position population
in1tiate Jan 14, 2025
ee4bbc9
clang-format pass :rolling_eyes:
in1tiate Jan 14, 2025
7ce2d73
disambiguate pair order further
in1tiate Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,26 +1394,18 @@ void Courtroom::set_background(QString p_background, bool display)
ui_vp_testimony->stopPlayback();
current_background = p_background;

// welcome to hardcode central may I take your order of regularly scheduled
// CBT
QMap<QString, QString> default_pos;
default_pos["defenseempty"] = "def";
default_pos["helperstand"] = "hld";
default_pos["prosecutorempty"] = "pro";
default_pos["prohelperstand"] = "hlp";
default_pos["witnessempty"] = "wit";
default_pos["judgestand"] = "jud";
default_pos["jurystand"] = "jur";
default_pos["seancestand"] = "sea";
// Modern positions paired to their legacy counterparts for use in dropdown population
// {"new", "old"}
static QList<QPair<QString, QString>> legacy_positions = {{"def", "defenseempty"}, {"hld", "helperstand"}, {"pro", "prosecutorempty"}, {"hlp", "prohelperstand"}, {"wit", "witnessempty"}, {"jud", "judgestand"}, {"jur", "jurystand"}, {"sea", "seancestand"}};

// Populate the dropdown list with all pos that exist on this bg
QStringList pos_list = {};
for (const QString &key : std::as_const(default_pos))
for (const QPair<QString, QString> &pos_pair : std::as_const(legacy_positions))
{
if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(default_pos[key]))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng
file_exists(ao_app->get_image_suffix(ao_app->get_background_path(key))))
{ // if we have pre-2.8-style positions, e.g. defenseempty.png
pos_list.append(default_pos[key]);
if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos_pair.first))) || // if we have 2.8-style positions, e.g. def.png, wit.webp, hld.apng
file_exists(ao_app->get_image_suffix(ao_app->get_background_path(pos_pair.second)))) // if we have pre-2.8-style positions, e.g. defenseempty.png
{
pos_list.append(pos_pair.first); // the dropdown always uses the new style
}
}
if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path("court"))))
Expand Down
Loading