Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-10-23 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Region flag upgrade & correct NTSC-U to NTSC-U/C

Browse source 
Replace references to NTSC-U with the correct NTSC-U/C and adds Canada in user-facing strings.
Replaces all region flags with revised SVGs.
Brings the US flag down to 3:2 to match Europe and Japan.
Adds a custom split US & Canada flag for the U/C region, also 3:2.
Generated PNGs and new HiDPI PNGs for region flags.
Flag PNGs were generated by downscaling using a Lanczos filter to a width of 36/72 pixels, then a 1px grey border added, then a 2/5px transparent border.
This commit is contained in:
Sam Pearman 2020-09-09 15:54:07 +09:00
parent 0efd0953b1
commit 2ef6b6aa40
17 changed files with 187 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/settings.cpp
View file

@ -326,7 +326,7 @@ const char* Settings::GetLogLevelDisplayName(LOGLEVEL level)
static std::array<const char*, 4> s_console_region_names = {{"Auto", "NTSC-J", "NTSC-U", "PAL"}}; static std::array<const char*, 4> s_console_region_names = {{"Auto", "NTSC-J", "NTSC-U", "PAL"}};
static std::array<const char*, 4> s_console_region_display_names = { static std::array<const char*, 4> s_console_region_display_names = {
{TRANSLATABLE("ConsoleRegion", "Auto-Detect"), TRANSLATABLE("ConsoleRegion", "NTSC-J (Japan)"), {TRANSLATABLE("ConsoleRegion", "Auto-Detect"), TRANSLATABLE("ConsoleRegion", "NTSC-J (Japan)"),
TRANSLATABLE("ConsoleRegion", "NTSC-U (US)"), TRANSLATABLE("ConsoleRegion", "PAL (Europe, Australia)")}}; TRANSLATABLE("ConsoleRegion", "NTSC-U/C (US, Canada)"), TRANSLATABLE("ConsoleRegion", "PAL (Europe, Australia)")}};
std::optional<ConsoleRegion> Settings::ParseConsoleRegionName(const char* str) std::optional<ConsoleRegion> Settings::ParseConsoleRegionName(const char* str)
{ {
@ -354,7 +354,7 @@ const char* Settings::GetConsoleRegionDisplayName(ConsoleRegion region)
static std::array<const char*, 4> s_disc_region_names = {{"NTSC-J", "NTSC-U", "PAL", "Other"}}; static std::array<const char*, 4> s_disc_region_names = {{"NTSC-J", "NTSC-U", "PAL", "Other"}};
static std::array<const char*, 4> s_disc_region_display_names = { static std::array<const char*, 4> s_disc_region_display_names = {
{TRANSLATABLE("DiscRegion", "NTSC-J (Japan)"), TRANSLATABLE("DiscRegion", "NTSC-U (US)"), {TRANSLATABLE("DiscRegion", "NTSC-J (Japan)"), TRANSLATABLE("DiscRegion", "NTSC-U/C (US, Canada)"),
TRANSLATABLE("DiscRegion", "PAL (Europe, Australia)"), TRANSLATABLE("DiscRegion", "Other")}}; TRANSLATABLE("DiscRegion", "PAL (Europe, Australia)"), TRANSLATABLE("DiscRegion", "Other")}};
std::optional<DiscRegion> Settings::ParseDiscRegionName(const char* str) std::optional<DiscRegion> Settings::ParseDiscRegionName(const char* str)

2
src/core/system.cpp
View file

@ -305,7 +305,7 @@ bool Boot(const SystemBootParameters& params)
// TODO: Pull region from PSF // TODO: Pull region from PSF
if (s_region == ConsoleRegion::Auto) if (s_region == ConsoleRegion::Auto)
{ {
Log_InfoPrintf("Defaulting to NTSC-U region for executable."); Log_InfoPrintf("Defaulting to NTSC-U/C region for executable.");
s_region = ConsoleRegion::NTSC_U; s_region = ConsoleRegion::NTSC_U;
} }
} }

2
src/duckstation-libretro/libretro_host_interface.cpp
View file

@ -376,7 +376,7 @@ static std::array<retro_core_option_definition, 32> s_option_definitions = {{
"Determines which region/hardware to emulate. Auto-Detect will use the region of the disc inserted.", "Determines which region/hardware to emulate. Auto-Detect will use the region of the disc inserted.",
{{"Auto", "Auto-Detect"}, {{"Auto", "Auto-Detect"},
{"NTSC-J", "NTSC-J (Japan)"}, {"NTSC-J", "NTSC-J (Japan)"},
{"NTSC-U", "NTSC-U (US)"}, {"NTSC-U", "NTSC-U/C (US, Canada)"},
{"PAL", "PAL (Europe, Australia)"}}, {"PAL", "PAL (Europe, Australia)"}},
"Auto"}, "Auto"},
{"duckstation_BIOS.PatchFastBoot", {"duckstation_BIOS.PatchFastBoot",

2
src/duckstation-qt/gamelistmodel.cpp
View file

@ -280,7 +280,7 @@ void GameListModel::loadCommonImages()
m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png")); m_type_playlist_pixmap.load(QStringLiteral(":/icons/address-book-new-22.png"));
m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png")); m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png"));
m_region_jp_pixmap.load(QStringLiteral(":/icons/flag-jp.png")); m_region_jp_pixmap.load(QStringLiteral(":/icons/flag-jp.png"));
m_region_us_pixmap.load(QStringLiteral(":/icons/flag-us.png")); m_region_us_pixmap.load(QStringLiteral(":/icons/flag-uc.png"));
m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png")); m_region_eu_pixmap.load(QStringLiteral(":/icons/flag-eu.png"));
for (int i = 0; i < static_cast<int>(GameListCompatibilityRating::Count); i++) for (int i = 0; i < static_cast<int>(GameListCompatibilityRating::Count); i++)

BIN
src/duckstation-qt/resources/icons/flag-eu.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

48
src/duckstation-qt/resources/icons/flag-eu.svg
View file

@ -1,29 +1,31 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 810 540"> <?xml version="1.0" standalone="no"?>
<desc>European flag</desc> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="900" height="600" viewBox="0 0 810 540">
<desc>European Union flag</desc>
<defs> <defs>
<g id="s"> <g id="s">
<g id="c"> <g id="c">
<path id="t" d="M0,0v1h0.5z" transform="translate(0,-1)rotate(18)"/> <path id="t" d="M0,0v1h0.5z" transform="translate(0,-1)rotate(18)"/>
<use xlink:href="#t" transform="scale(-1,1)"/> <use xlink:href="#t" transform="scale(-1,1)"/>
</g> </g>
<g id="a"> <g id="a">
<use xlink:href="#c" transform="rotate(72)"/> <use xlink:href="#c" transform="rotate(72)"/>
<use xlink:href="#c" transform="rotate(144)"/> <use xlink:href="#c" transform="rotate(144)"/>
</g> </g>
<use xlink:href="#a" transform="scale(-1,1)"/> <use xlink:href="#a" transform="scale(-1,1)"/>
</g> </g>
</defs> </defs>
<rect fill="#039" width="810" height="540"/> <rect fill="#039" width="810" height="540"/>
<g fill="#fc0" transform="scale(30)translate(13.5,9)"> <g fill="#fc0" transform="scale(30)translate(13.5,9)">
<use xlink:href="#s" y="-6"/> <use xlink:href="#s" y="-6"/>
<use xlink:href="#s" y="6"/> <use xlink:href="#s" y="6"/>
<g id="l"> <g id="l">
<use xlink:href="#s" x="-6"/> <use xlink:href="#s" x="-6"/>
<use xlink:href="#s" transform="rotate(150)translate(0,6)rotate(66)"/> <use xlink:href="#s" transform="rotate(150)translate(0,6)rotate(66)"/>
<use xlink:href="#s" transform="rotate(120)translate(0,6)rotate(24)"/> <use xlink:href="#s" transform="rotate(120)translate(0,6)rotate(24)"/>
<use xlink:href="#s" transform="rotate(60)translate(0,6)rotate(12)"/> <use xlink:href="#s" transform="rotate(60)translate(0,6)rotate(12)"/>
<use xlink:href="#s" transform="rotate(30)translate(0,6)rotate(42)"/> <use xlink:href="#s" transform="rotate(30)translate(0,6)rotate(42)"/>
</g> </g>
<use xlink:href="#l" transform="scale(-1,1)"/> <use xlink:href="#l" transform="scale(-1,1)"/>
</g> </g>
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 997 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/duckstation-qt/resources/icons/flag-eu@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
src/duckstation-qt/resources/icons/flag-jp.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 887 B

After

Width:  |  Height:  |  Size: 2 KiB

1
src/duckstation-qt/resources/icons/flag-jp.svg
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="900" height="600"> <svg xmlns="http://www.w3.org/2000/svg" width="900" height="600">
<desc>Japanese flag</desc>
<rect fill="#fff" height="600" width="900"/> <rect fill="#fff" height="600" width="900"/>
<circle fill="#bc002d" cx="450" cy="300" r="180"/> <circle fill="#bc002d" cx="450" cy="300" r="180"/>
</svg> </svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 234 B

BIN
src/duckstation-qt/resources/icons/flag-jp@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/duckstation-qt/resources/icons/flag-uc.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

118
src/duckstation-qt/resources/icons/flag-uc.svg Normal file
View file

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<svg width="900px" height="600px" viewBox="0 0 5850 3900" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
<desc>Vertically split United States and Canada flag, made for identification of the NTSU-U/C region.</desc>
<defs>
<rect width="5850" height="3900" id="artboard_1" />
<clipPath id="clip_1">
<use xlink:href="#artboard_1" clip-rule="evenodd" />
</clipPath>
</defs>
<g id="Flag-3:2" clip-path="url(#clip_1)">
<use xlink:href="#artboard_1" stroke="none" fill="#FFFFFF" />
<g id="flag-us-Copy" transform="translate(0.484375 -3.0517578E-05)">
<path d="M0 0L5850 0L5850 3900L0 3900L0 0Z" id="Rectangle" fill="#B22234" stroke="none" />
<path d="M5850 1800L0 1800M0 2400L5850 2400M5850 3000L0 3000M0 0L5850 0M0 1200L5850 1200M5850 600L0 600" transform="translate(0 450)" id="Shape" fill="#000000" stroke="#FFFFFF" stroke-width="300" />
<path d="M0 0L2925 0L2925 2100L0 2100L0 0Z" id="Rectangle" fill="#3C3B6E" stroke="none" />
<g id="Group" transform="translate(113 83)">
<g id="s18">
<g id="s9">
<g id="s5">
<g id="s4">
<g id="Group">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1680)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(247 210)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(247 630)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(247 1050)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(247 1470)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(494 0)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(494 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(494 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(494 1260)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(494 1680)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(741 210)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(741 630)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(741 1050)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(741 1470)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(988 0)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(988 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(988 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(988 1260)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(988 1680)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(1235 210)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(1235 630)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(1235 1050)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(1235 1470)" id="s" fill="#FFFFFF" stroke="none" />
<g id="s5" transform="translate(1482 0)">
<g id="s4">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1680)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<g id="s4" transform="translate(1729.0007 210)">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<g id="s9" transform="translate(1976.001 0)">
<g id="s5">
<g id="s4">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1680)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<g id="s4" transform="translate(247.00006 210)">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
</g>
</g>
<g id="s5" transform="translate(2470 0)">
<g id="s4">
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 420)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 840)" id="s" fill="#FFFFFF" stroke="none" />
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1260)" id="s" fill="#FFFFFF" stroke="none" />
</g>
<path d="M114.127 0L184.661 217.082L0 82.9179L228.254 82.9179L43.5926 217.082L114.127 0Z" transform="translate(0 1680)" id="s" fill="#FFFFFF" stroke="none" />
</g>
</g>
</g>
</g>
<g id="s4" transform="translate(266.74683 216.91797)" />
</g>
<g id="s9" transform="translate(513.7468 6.9179688)">
<g id="s5">
<g id="s4" />
</g>
<g id="s4" transform="translate(247 210)" />
</g>
</g>
<g id="s18" transform="translate(1007.7468 6.9179688)">
<g id="s9">
<g id="s5">
<g id="s4" />
</g>
<g id="s4" transform="translate(247 210)" />
</g>
<g id="s9" transform="translate(494 0)" />
</g>
</g>
</g>
<g id="Group-Copy" transform="translate(2925.4844 -3.0517578E-05)">
<path d="M0 0L2925 0L2925 3900L0 3900L0 0Z" transform="translate(0.25 0)" id="Rectangle" fill="#D52B1E" stroke="none" />
<path d="M2925 0L0 0L0 3900L2925 3900L2925 0ZM1483.77 2507.42L1505.55 2925L1418.45 2925L1440.23 2507.42C1440.87 2493.51 1435.17 2480.06 1424.73 2470.84C1414.29 2461.63 1400.24 2457.64 1386.52 2460L970.871 2533.06L1027 2378.23C1031.67 2365.59 1027.78 2351.39 1017.32 2342.9L562 1974.19L664.581 1926.29C678.915 1919.52 685.967 1903.13 681.032 1888.06L591.032 1611.29L853.29 1666.94C867.939 1669.99 882.712 1662.3 888.613 1648.55L939.42 1529.03L1144.1 1748.71C1153.71 1758.85 1168.86 1761.43 1181.29 1755.05C1193.72 1748.67 1200.45 1734.85 1197.81 1721.13L1099.1 1212.1L1257.32 1303.55C1264.83 1307.95 1273.83 1309.04 1282.17 1306.57C1290.52 1304.09 1297.46 1298.27 1301.36 1290.48L1462 975L1622.65 1290.48C1626.54 1298.27 1633.48 1304.09 1641.83 1306.57C1650.17 1309.04 1659.17 1307.95 1666.68 1303.55L1824.9 1212.1L1726.19 1721.13C1723.55 1734.85 1730.28 1748.67 1742.71 1755.05C1755.14 1761.43 1770.29 1758.85 1779.9 1748.71L1984.58 1529.03L2035.39 1648.55C2041.29 1662.3 2056.06 1669.99 2070.71 1666.94L2332.97 1611.29L2242.97 1888.06C2238.03 1903.13 2245.09 1919.52 2259.42 1926.29L2362 1974.19L1906.68 2342.9C1896.22 2351.39 1892.33 2365.59 1897 2378.23L1953.13 2533.06L1537.48 2460C1523.76 2457.64 1509.71 2461.63 1499.27 2470.84C1488.83 2480.06 1483.13 2493.51 1483.77 2507.42Z" id="Shape" fill="#FFFFFF" fill-rule="evenodd" stroke="none" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
src/duckstation-qt/resources/icons/flag-uc@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/duckstation-qt/resources/icons/flag-us.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

38
src/duckstation-qt/resources/icons/flag-us.svg
View file

@ -1,12 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1235" height="650"> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="900" height="600" viewBox="0 0 5850 3900">
<defs> <desc>United States flag, reworked as 2:3. This involved shrinking the stripes from the right until the flag was the right aspect, then shrinking the canton horizontally so that it only occupied 1/2 of the flag's width, then transposing the stars so that they were centered within the canton.</desc>
<polygon id="pt" points="-0.1624598481164531,0 0,-0.5 0.1624598481164531,0" transform="scale(0.0616)" fill="#FFF"/> <rect width="5850" height="3900" fill="#b22234"/> <!-- red backdrop -->
<g id="star"><use xlink:href="#pt" transform="rotate(-144)"/><use xlink:href="#pt" transform="rotate(-72)"/><use xlink:href="#pt"/><use xlink:href="#pt" transform="rotate(72)"/><use xlink:href="#pt" transform="rotate(144)"/></g> <path d="M0,450H5850m0,600H0m0,600H5850m0,600H0m0,600H5850m0,600H0" stroke="#fff" stroke-width="300"/> <!-- 6 white stripes -->
<g id="s5"><use xlink:href="#star" x="-0.252"/><use xlink:href="#star" x="-0.126"/><use xlink:href="#star"/><use xlink:href="#star" x="0.126"/><use xlink:href="#star" x="0.252"/></g> <rect width="2925" height="2100" fill="#3c3b6e"/> <!-- blue canton 2964 > 2925. 39px difference. -->
<g id="s6"><use xlink:href="#s5" x="-0.063"/><use xlink:href="#star" x="0.315"/></g> <g fill="#fff">
<g id="x4"><use xlink:href="#s6"/><use xlink:href="#s5" y="0.054"/><use xlink:href="#s6" y="0.108"/><use xlink:href="#s5" y="0.162"/></g> <g id="s18">
<g id="u"><use xlink:href="#x4" y="-0.216"/><use xlink:href="#x4"/><use xlink:href="#s6" y="0.216"/></g> <g id="s9"> <!-- 9 stars, comprised of vertical sets of 5 and 4 defined inside this block -->
<rect id="stripe" width="1235" height="50" fill="#B22234"/> <g id="s5">
</defs> <g id="s4">
<rect width="1235" height="650" fill="#FFF"/><use xlink:href="#stripe"/><use xlink:href="#stripe" y="100"/><use xlink:href="#stripe" y="200"/><use xlink:href="#stripe" y="300"/><use xlink:href="#stripe" y="400"/><use xlink:href="#stripe" y="500"/><use xlink:href="#stripe" y="600"/><rect width="494" height="350" fill="#3C3B6E"/><use xlink:href="#u" transform="translate(247,175) scale(650)"/></svg> <!-- Left shifted 19.5 from original position to align stars in smaller box -->
<path id="s" d="M227.5,90 298.034230,307.082039 113.373218,172.917961H341.626782L156.965770,307.082039z"/> <!-- star, done in 5 points -->
<use xlink:href="#s" y="420"/>
<use xlink:href="#s" y="840"/>
<use xlink:href="#s" y="1260"/>
</g>
<use xlink:href="#s" y="1680"/>
</g>
<use xlink:href="#s4" x="247" y="210"/>
</g>
<use xlink:href="#s9" x="494"/>
</g>
<use xlink:href="#s18" x="988"/>
<use xlink:href="#s9" x="1976"/>
<use xlink:href="#s5" x="2470"/>
</g>
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/duckstation-qt/resources/icons/flag-us@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.5 KiB

14
src/duckstation-qt/resources/resources.qrc
View file

@ -1,11 +1,19 @@
<RCC> <RCC>
<qresource> <qresource>
<file>icons/flag-eu.png</file>
<file>icons/flag-eu.svg</file> <file>icons/flag-eu.svg</file>
<file>icons/flag-jp.png</file> <file>icons/flag-eu.png</file>
<file>icons/flag-eu@2x.png</file>
<file>icons/flag-jp.svg</file> <file>icons/flag-jp.svg</file>
<file>icons/flag-us.png</file> <file>icons/flag-jp.png</file>
<file>icons/flag-jp@2x.png</file>
<file>icons/flag-uc.svg</file>
<file>icons/flag-uc.png</file>
<file>icons/flag-uc@2x.png</file>
<!--
<file>icons/flag-us.svg</file> <file>icons/flag-us.svg</file>
<file>icons/flag-us.png</file>
<file>icons/flag-us@2x.png</file>
-->
<file>icons/star-0.png</file> <file>icons/star-0.png</file>
<file>icons/star-1.png</file> <file>icons/star-1.png</file>
<file>icons/star-2.png</file> <file>icons/star-2.png</file>