diff --git a/CMakeLists.txt b/CMakeLists.txt index 33faba5f6..224fea7c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/docs/img/skyemu_icon.png b/docs/img/skyemu_icon.png new file mode 100644 index 000000000..d5f3b9d4c Binary files /dev/null and b/docs/img/skyemu_icon.png differ diff --git a/include/frontend_settings.hpp b/include/frontend_settings.hpp index aaf9eaf0e..1a78ab66f 100644 --- a/include/frontend_settings.hpp +++ b/include/frontend_settings.hpp @@ -19,6 +19,7 @@ struct FrontendSettings { Rsyn = 1, Rnap = 2, Rcow = 3, + SkyEmu = 4, }; Theme theme = Theme::Dark; diff --git a/src/frontend_settings.cpp b/src/frontend_settings.cpp index 16bae3615..498ba5004 100644 --- a/src/frontend_settings.cpp +++ b/src/frontend_settings.cpp @@ -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 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()) { @@ -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"; diff --git a/src/panda_qt/config_window.cpp b/src/panda_qt/config_window.cpp index 92fa0741e..60ec3ed26 100644 --- a/src/panda_qt/config_window.cpp +++ b/src/panda_qt/config_window.cpp @@ -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(config.frontendSettings.icon)); connect(iconSelect, &QComboBox::currentIndexChanged, this, [&](int index) { @@ -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;