mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-08 23:25:40 +12:00
Qt: Add runpog icon (#752)
Some checks failed
Android Build / x64 (release) (push) Has been cancelled
Android Build / arm64 (release) (push) Has been cancelled
HTTP Server Build / build (push) Has been cancelled
Hydra Core Build / Windows (push) Has been cancelled
Hydra Core Build / MacOS (push) Has been cancelled
Hydra Core Build / Linux (push) Has been cancelled
Hydra Core Build / Android-x64 (push) Has been cancelled
Hydra Core Build / ARM-Libretro (push) Has been cancelled
Linux AppImage Build / build (push) Has been cancelled
Linux Build / build (push) Has been cancelled
MacOS Build / MacOS-arm64 (push) Has been cancelled
MacOS Build / MacOS-x86_64 (push) Has been cancelled
MacOS Build / MacOS-Universal (push) Has been cancelled
Qt Build / Windows (push) Has been cancelled
Qt Build / MacOS-arm64 (push) Has been cancelled
Qt Build / MacOS-x86_64 (push) Has been cancelled
Qt Build / MacOS-Universal (push) Has been cancelled
Qt Build / Linux (push) Has been cancelled
Windows Build / build (push) Has been cancelled
iOS Simulator Build / build (push) Has been cancelled
Some checks failed
Android Build / x64 (release) (push) Has been cancelled
Android Build / arm64 (release) (push) Has been cancelled
HTTP Server Build / build (push) Has been cancelled
Hydra Core Build / Windows (push) Has been cancelled
Hydra Core Build / MacOS (push) Has been cancelled
Hydra Core Build / Linux (push) Has been cancelled
Hydra Core Build / Android-x64 (push) Has been cancelled
Hydra Core Build / ARM-Libretro (push) Has been cancelled
Linux AppImage Build / build (push) Has been cancelled
Linux Build / build (push) Has been cancelled
MacOS Build / MacOS-arm64 (push) Has been cancelled
MacOS Build / MacOS-x86_64 (push) Has been cancelled
MacOS Build / MacOS-Universal (push) Has been cancelled
Qt Build / Windows (push) Has been cancelled
Qt Build / MacOS-arm64 (push) Has been cancelled
Qt Build / MacOS-x86_64 (push) Has been cancelled
Qt Build / MacOS-Universal (push) Has been cancelled
Qt Build / Linux (push) Has been cancelled
Windows Build / build (push) Has been cancelled
iOS Simulator Build / build (push) Has been cancelled
This commit is contained in:
parent
fec4428ebf
commit
7bd6cef3f0
5 changed files with 6 additions and 2 deletions
|
@ -781,7 +781,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/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/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/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/skyemu_icon.png
|
docs/img/rnap_icon.png docs/img/rcow_icon.png docs/img/skyemu_icon.png docs/img/runpog_icon.png
|
||||||
)
|
)
|
||||||
|
|
||||||
# Translation files in Qt's .ts format. Will be converted into binary files and embedded into the executable
|
# Translation files in Qt's .ts format. Will be converted into binary files and embedded into the executable
|
||||||
|
|
BIN
docs/img/runpog_icon.png
Normal file
BIN
docs/img/runpog_icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
|
@ -21,6 +21,7 @@ struct FrontendSettings {
|
||||||
Rnap = 2,
|
Rnap = 2,
|
||||||
Rcow = 3,
|
Rcow = 3,
|
||||||
SkyEmu = 4,
|
SkyEmu = 4,
|
||||||
|
Runpog = 5,
|
||||||
};
|
};
|
||||||
|
|
||||||
Theme theme = Theme::Dark;
|
Theme theme = Theme::Dark;
|
||||||
|
|
|
@ -40,7 +40,7 @@ FrontendSettings::WindowIcon FrontendSettings::iconFromString(std::string inStri
|
||||||
|
|
||||||
static const std::unordered_map<std::string, WindowIcon> map = {
|
static const std::unordered_map<std::string, WindowIcon> map = {
|
||||||
{"rpog", WindowIcon::Rpog}, {"rsyn", WindowIcon::Rsyn}, {"rcow", WindowIcon::Rcow},
|
{"rpog", WindowIcon::Rpog}, {"rsyn", WindowIcon::Rsyn}, {"rcow", WindowIcon::Rcow},
|
||||||
{"rnap", WindowIcon::Rnap}, {"skyemu", WindowIcon::SkyEmu},
|
{"rnap", WindowIcon::Rnap}, {"skyemu", WindowIcon::SkyEmu}, {"runpog", WindowIcon::Runpog},
|
||||||
};
|
};
|
||||||
|
|
||||||
if (auto search = map.find(inString); search != map.end()) {
|
if (auto search = map.find(inString); search != map.end()) {
|
||||||
|
@ -57,6 +57,7 @@ const char* FrontendSettings::iconToString(WindowIcon icon) {
|
||||||
case WindowIcon::Rcow: return "rcow";
|
case WindowIcon::Rcow: return "rcow";
|
||||||
case WindowIcon::Rnap: return "rnap";
|
case WindowIcon::Rnap: return "rnap";
|
||||||
case WindowIcon::SkyEmu: return "skyemu";
|
case WindowIcon::SkyEmu: return "skyemu";
|
||||||
|
case WindowIcon::Runpog: return "runpog";
|
||||||
|
|
||||||
case WindowIcon::Rpog:
|
case WindowIcon::Rpog:
|
||||||
default: return "rpog";
|
default: return "rpog";
|
||||||
|
|
|
@ -87,6 +87,7 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win
|
||||||
iconSelect->addItem(tr("Sleepy panda"));
|
iconSelect->addItem(tr("Sleepy panda"));
|
||||||
iconSelect->addItem(tr("Cow panda"));
|
iconSelect->addItem(tr("Cow panda"));
|
||||||
iconSelect->addItem(tr("The penguin from SkyEmu"));
|
iconSelect->addItem(tr("The penguin from SkyEmu"));
|
||||||
|
iconSelect->addItem(tr("Unpog"));
|
||||||
iconSelect->setCurrentIndex(static_cast<int>(config.frontendSettings.icon));
|
iconSelect->setCurrentIndex(static_cast<int>(config.frontendSettings.icon));
|
||||||
|
|
||||||
connect(iconSelect, &QComboBox::currentIndexChanged, this, [&](int index) {
|
connect(iconSelect, &QComboBox::currentIndexChanged, this, [&](int index) {
|
||||||
|
@ -483,6 +484,7 @@ void ConfigWindow::setIcon(WindowIcon icon) {
|
||||||
case WindowIcon::Rnap: updateIcon(":/docs/img/rnap_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::Rcow: updateIcon(":/docs/img/rcow_icon.png"); break;
|
||||||
case WindowIcon::SkyEmu: updateIcon(":/docs/img/skyemu_icon.png"); break;
|
case WindowIcon::SkyEmu: updateIcon(":/docs/img/skyemu_icon.png"); break;
|
||||||
|
case WindowIcon::Runpog: updateIcon(":/docs/img/runpog_icon.png"); break;
|
||||||
|
|
||||||
case WindowIcon::Rpog:
|
case WindowIcon::Rpog:
|
||||||
default: updateIcon(":/docs/img/rpog_icon.png"); break;
|
default: updateIcon(":/docs/img/rpog_icon.png"); break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue