Skip to content

Commit

Permalink
Qt: Add SkyEmu duck icon (#657)
Browse files Browse the repository at this point in the history
  • Loading branch information
wheremyfoodat authored Dec 2, 2024
1 parent 79a9de2 commit 545ac81
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ if(NOT BUILD_HYDRA_CORE AND NOT BUILD_LIBRETRO_CORE)
docs/img/rsob_icon.png docs/img/rstarstruck_icon.png docs/img/rpog_icon.png docs/img/rsyn_icon.png
docs/img/settings_icon.png docs/img/display_icon.png docs/img/speaker_icon.png
docs/img/sparkling_icon.png docs/img/battery_icon.png docs/img/sdcard_icon.png
docs/img/rnap_icon.png docs/img/rcow_icon.png
docs/img/rnap_icon.png docs/img/rcow_icon.png docs/img/skyemu_icon.png
)
else()
set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp src/panda_sdl/frontend_sdl.cpp src/panda_sdl/mappings.cpp)
Expand Down
Binary file added docs/img/skyemu_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions include/frontend_settings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ struct FrontendSettings {
Rsyn = 1,
Rnap = 2,
Rcow = 3,
SkyEmu = 4,
};

Theme theme = Theme::Dark;
Expand Down
7 changes: 3 additions & 4 deletions src/frontend_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ FrontendSettings::WindowIcon FrontendSettings::iconFromString(std::string inStri
std::transform(inString.begin(), inString.end(), inString.begin(), [](unsigned char c) { return std::tolower(c); });

static const std::unordered_map<std::string, WindowIcon> map = {
{"rpog", WindowIcon::Rpog},
{"rsyn", WindowIcon::Rsyn},
{"rcow", WindowIcon::Rcow},
{"rnap", WindowIcon::Rnap},
{"rpog", WindowIcon::Rpog}, {"rsyn", WindowIcon::Rsyn}, {"rcow", WindowIcon::Rcow},
{"rnap", WindowIcon::Rnap}, {"skyemu", WindowIcon::SkyEmu},
};

if (auto search = map.find(inString); search != map.end()) {
Expand All @@ -57,6 +55,7 @@ const char* FrontendSettings::iconToString(WindowIcon icon) {
case WindowIcon::Rsyn: return "rsyn";
case WindowIcon::Rcow: return "rcow";
case WindowIcon::Rnap: return "rnap";
case WindowIcon::SkyEmu: return "skyemu";

case WindowIcon::Rpog:
default: return "rpog";
Expand Down
2 changes: 2 additions & 0 deletions src/panda_qt/config_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win
iconSelect->addItem(tr("Happy panda (colourful)"));
iconSelect->addItem(tr("Sleepy panda"));
iconSelect->addItem(tr("Cow panda"));
iconSelect->addItem(tr("The penguin from SkyEmu"));
iconSelect->setCurrentIndex(static_cast<int>(config.frontendSettings.icon));

connect(iconSelect, &QComboBox::currentIndexChanged, this, [&](int index) {
Expand Down Expand Up @@ -398,6 +399,7 @@ void ConfigWindow::setIcon(WindowIcon icon) {
case WindowIcon::Rsyn: updateIcon(":/docs/img/rsyn_icon.png"); break;
case WindowIcon::Rnap: updateIcon(":/docs/img/rnap_icon.png"); break;
case WindowIcon::Rcow: updateIcon(":/docs/img/rcow_icon.png"); break;
case WindowIcon::SkyEmu: updateIcon(":/docs/img/skyemu_icon.png"); break;

case WindowIcon::Rpog:
default: updateIcon(":/docs/img/rpog_icon.png"); break;
Expand Down

0 comments on commit 545ac81

Please sign in to comment.