Qt: Fix some translator lookups

This commit is contained in:
Vicki Pfau 2022-07-17 22:11:03 -07:00
parent ca484d38b8
commit ed5f65f36d
4 changed files with 28 additions and 30 deletions

View File

@ -330,17 +330,17 @@ if(${QT}LinguistTools_FOUND)
file(GLOB TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-*.ts") file(GLOB TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-*.ts")
if(UPDATE_TRANSLATIONS) if(UPDATE_TRANSLATIONS)
if(TARGET Qt6::Core) if(TARGET Qt6::Core)
qt_create_translation(TRANSLATION_FILES ${SOURCE_FILES} ${UI_FILES} ${TS_FILES} OPTIONS -locations absolute -no-obsolete) qt_create_translation(TRANSLATION_FILES ${SOURCE_FILES} ${UI_FILES} ${TS_FILES} ${CMAKE_CURRENT_SOURCE_DIR} OPTIONS -locations absolute -no-obsolete)
else() else()
qt5_create_translation(TRANSLATION_FILES ${SOURCE_FILES} ${UI_FILES} ${TS_FILES} OPTIONS -locations absolute -no-obsolete) qt5_create_translation(TRANSLATION_FILES ${SOURCE_FILES} ${UI_FILES} ${TS_FILES} ${CMAKE_CURRENT_SOURCE_DIR} OPTIONS -locations absolute -no-obsolete)
endif() endif()
list(REMOVE_ITEM TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-template.ts") list(REMOVE_ITEM TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-template.ts")
else() else()
list(REMOVE_ITEM TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-template.ts") list(REMOVE_ITEM TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/ts/${BINARY_NAME}-template.ts")
if(TARGET Qt6::Core) if(TARGET Qt6::Core)
qt_add_translation(TRANSLATION_FILES ${TS_FILES}) qt_add_translation(TRANSLATION_FILES ${TS_FILES} ${CMAKE_CURRENT_SOURCE_DIR})
else() else()
qt5_add_translation(TRANSLATION_FILES ${TS_FILES}) qt5_add_translation(TRANSLATION_FILES ${TS_FILES} ${CMAKE_CURRENT_SOURCE_DIR})
endif() endif()
endif() endif()
set(QT_QM_FILES) set(QT_QM_FILES)

View File

@ -44,9 +44,7 @@ static const QList<GBMemoryBankControllerType> s_mbcList{
static QMap<GBModel, QString> s_gbModelNames; static QMap<GBModel, QString> s_gbModelNames;
static QMap<GBMemoryBankControllerType, QString> s_mbcNames; static QMap<GBMemoryBankControllerType, QString> s_mbcNames;
static QString tr(const char* str) { #define tr(STR) QCoreApplication::translate("QGBA::GameBoy", STR)
return QCoreApplication::translate("Game Boy", str);
}
QList<GBModel> GameBoy::modelList() { QList<GBModel> GameBoy::modelList() {
return s_gbModelList; return s_gbModelList;

View File

@ -447,14 +447,14 @@ SaveConverter::AnnotatedSave::operator QString() const {
QString typeFormat("%1"); QString typeFormat("%1");
QString endianStr; QString endianStr;
QString saveType; QString saveType;
QString format = QCoreApplication::translate("SaveConverter", "%1 %2 save game"); QString format = QCoreApplication::translate("QGBA::SaveConverter", "%1 %2 save game");
switch (endianness) { switch (endianness) {
case Endian::LITTLE: case Endian::LITTLE:
endianStr = QCoreApplication::translate("SaveConverter", "little endian"); endianStr = QCoreApplication::translate("QGBA::SaveConverter", "little endian");
break; break;
case Endian::BIG: case Endian::BIG:
endianStr = QCoreApplication::translate("SaveConverter", "big endian"); endianStr = QCoreApplication::translate("QGBA::SaveConverter", "big endian");
break; break;
default: default:
break; break;
@ -465,15 +465,15 @@ SaveConverter::AnnotatedSave::operator QString() const {
case mPLATFORM_GBA: case mPLATFORM_GBA:
switch (gba.type) { switch (gba.type) {
case SAVEDATA_SRAM: case SAVEDATA_SRAM:
typeFormat = QCoreApplication::translate("SaveConverter", "SRAM"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "SRAM");
break; break;
case SAVEDATA_FLASH512: case SAVEDATA_FLASH512:
case SAVEDATA_FLASH1M: case SAVEDATA_FLASH1M:
typeFormat = QCoreApplication::translate("SaveConverter", "%1 flash"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "%1 flash");
break; break;
case SAVEDATA_EEPROM: case SAVEDATA_EEPROM:
case SAVEDATA_EEPROM512: case SAVEDATA_EEPROM512:
typeFormat = QCoreApplication::translate("SaveConverter", "%1 EEPROM"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "%1 EEPROM");
break; break;
default: default:
break; break;
@ -485,29 +485,29 @@ SaveConverter::AnnotatedSave::operator QString() const {
switch (gb.type) { switch (gb.type) {
case GB_MBC_AUTODETECT: case GB_MBC_AUTODETECT:
if (size & 0xFF) { if (size & 0xFF) {
typeFormat = QCoreApplication::translate("SaveConverter", "%1 SRAM + RTC"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "%1 SRAM + RTC");
} else { } else {
typeFormat = QCoreApplication::translate("SaveConverter", "%1 SRAM"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "%1 SRAM");
} }
break; break;
case GB_MBC2: case GB_MBC2:
if (size == 0x100) { if (size == 0x100) {
typeFormat = QCoreApplication::translate("SaveConverter", "packed MBC2"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "packed MBC2");
} else { } else {
typeFormat = QCoreApplication::translate("SaveConverter", "unpacked MBC2"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "unpacked MBC2");
} }
break; break;
case GB_MBC6: case GB_MBC6:
if (size == GB_SIZE_MBC6_FLASH) { if (size == GB_SIZE_MBC6_FLASH) {
typeFormat = QCoreApplication::translate("SaveConverter", "MBC6 flash"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "MBC6 flash");
} else if (size > GB_SIZE_MBC6_FLASH) { } else if (size > GB_SIZE_MBC6_FLASH) {
typeFormat = QCoreApplication::translate("SaveConverter", "MBC6 combined SRAM + flash"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "MBC6 combined SRAM + flash");
} else { } else {
typeFormat = QCoreApplication::translate("SaveConverter", "MBC6 SRAM"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "MBC6 SRAM");
} }
break; break;
case GB_TAMA5: case GB_TAMA5:
typeFormat = QCoreApplication::translate("SaveConverter", "TAMA5"); typeFormat = QCoreApplication::translate("QGBA::SaveConverter", "TAMA5");
break; break;
default: default:
break; break;
@ -519,17 +519,17 @@ SaveConverter::AnnotatedSave::operator QString() const {
} }
saveType = typeFormat.arg(sizeStr); saveType = typeFormat.arg(sizeStr);
if (!endianStr.isEmpty()) { if (!endianStr.isEmpty()) {
saveType = QCoreApplication::translate("SaveConverter", "%1 (%2)").arg(saveType).arg(endianStr); saveType = QCoreApplication::translate("QGBA::SaveConverter", "%1 (%2)").arg(saveType).arg(endianStr);
} }
switch (container) { switch (container) {
case Container::SAVESTATE: case Container::SAVESTATE:
format = QCoreApplication::translate("SaveConverter", "%1 save state with embedded %2 save game"); format = QCoreApplication::translate("QGBA::SaveConverter", "%1 save state with embedded %2 save game");
break; break;
case Container::SHARKPORT: case Container::SHARKPORT:
format = QCoreApplication::translate("SaveConverter", "%1 SharkPort %2 save game"); format = QCoreApplication::translate("QGBA::SaveConverter", "%1 SharkPort %2 save game");
break; break;
case Container::GSV: case Container::GSV:
format = QCoreApplication::translate("SaveConverter", "%1 GameShark Advance SP %2 save game"); format = QCoreApplication::translate("QGBA::SaveConverter", "%1 GameShark Advance SP %2 save game");
break; break;
case Container::NONE: case Container::NONE:
break; break;

View File

@ -48,11 +48,11 @@ LibraryTree::LibraryTree(LibraryController* parent)
m_widget->setAlternatingRowColors(true); m_widget->setAlternatingRowColors(true);
QTreeWidgetItem* header = new QTreeWidgetItem({ QTreeWidgetItem* header = new QTreeWidgetItem({
QApplication::translate("LibraryTree", "Name", nullptr), QApplication::translate("QGBA::LibraryTree", "Name", nullptr),
QApplication::translate("LibraryTree", "Location", nullptr), QApplication::translate("QGBA::LibraryTree", "Location", nullptr),
QApplication::translate("LibraryTree", "Platform", nullptr), QApplication::translate("QGBA::LibraryTree", "Platform", nullptr),
QApplication::translate("LibraryTree", "Size", nullptr), QApplication::translate("QGBA::LibraryTree", "Size", nullptr),
QApplication::translate("LibraryTree", "CRC32", nullptr), QApplication::translate("QGBA::LibraryTree", "CRC32", nullptr),
}); });
header->setTextAlignment(3, Qt::AlignTrailing | Qt::AlignVCenter); header->setTextAlignment(3, Qt::AlignTrailing | Qt::AlignVCenter);
m_widget->setHeaderItem(header); m_widget->setHeaderItem(header);