piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use EnumFormatter to generate names for EXI devices

Browse Source 
This simplifies the code in GameCubePane, and allows us to use the EXIDeviceType enum in error messages.
This commit is contained in:
Pokechu22
2022-01-11 17:10:13 -08:00
parent d354163fbe
commit fefde0481d
3 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@ -16,6 +16,7 @@
#include <QPushButton>
#include <QVBoxLayout>
#include <array>
#include <utility>
#include "Common/CommonPaths.h"
@ -97,31 +98,28 @@ void GameCubePane::CreateWidgets()
}
// Add slot devices
for (const auto& entry : {std::make_pair(tr("<Nothing>"), EXIDeviceType::None),
std::make_pair(tr("Dummy"), EXIDeviceType::Dummy),
std::make_pair(tr("Memory Card"), EXIDeviceType::MemoryCard),
std::make_pair(tr("GCI Folder"), EXIDeviceType::MemoryCardFolder),
std::make_pair(tr("USB Gecko"), EXIDeviceType::Gecko),
std::make_pair(tr("Advance Game Port"), EXIDeviceType::AGP),
std::make_pair(tr("Microphone"), EXIDeviceType::Microphone)})
for (const auto device : {EXIDeviceType::None, EXIDeviceType::Dummy, EXIDeviceType::MemoryCard,
EXIDeviceType::MemoryCardFolder, EXIDeviceType::Gecko,
EXIDeviceType::AGP, EXIDeviceType::Microphone})
{
m_slot_combos[0]->addItem(entry.first, static_cast<int>(entry.second));
m_slot_combos[1]->addItem(entry.first, static_cast<int>(entry.second));
const QString name = tr(fmt::format("{:n}", device).c_str());
const int value = static_cast<int>(device);
m_slot_combos[0]->addItem(name, value);
m_slot_combos[1]->addItem(name, value);
}
// Add SP1 devices
std::vector<std::pair<QString, EXIDeviceType>> sp1Entries{
std::make_pair(tr("<Nothing>"), EXIDeviceType::None),
std::make_pair(tr("Dummy"), EXIDeviceType::Dummy),
std::make_pair(tr("Broadband Adapter (TAP)"), EXIDeviceType::Ethernet),
std::make_pair(tr("Broadband Adapter (XLink Kai)"), EXIDeviceType::EthernetXLink)};
#if defined(__APPLE__)
sp1Entries.emplace_back(std::make_pair(tr("Broadband Adapter (tapserver)"),
ExpansionInterface::EXIDeviceType::EthernetTapServer));
for (const auto device : {
EXIDeviceType::None,
EXIDeviceType::Dummy,
EXIDeviceType::Ethernet,
EXIDeviceType::EthernetXLink,
#ifdef __APPLE__
EXIDeviceType::EthernetTapServer,
#endif
for (const auto& entry : sp1Entries)
})
{
m_slot_combos[2]->addItem(entry.first, static_cast<int>(entry.second));
m_slot_combos[2]->addItem(tr(fmt::format("{:n}", device).c_str()), static_cast<int>(device));
}
device_layout->addWidget(new QLabel(tr("Slot A:")), 0, 0);