Merge pull request #1302 from lioncash/config

yuzu/configure_gamelist: Mark combo-box strings as translatable
This commit is contained in:
bunnei 2018-09-12 18:24:11 -04:00 committed by GitHub
commit 938aa5779c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 36 deletions

View file

@ -2,47 +2,51 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core/core.h" #include <array>
#include <utility>
#include "common/common_types.h"
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_gamelist.h" #include "ui_configure_gamelist.h"
#include "ui_settings.h"
#include "yuzu/configuration/configure_gamelist.h" #include "yuzu/configuration/configure_gamelist.h"
#include "yuzu/ui_settings.h"
namespace {
constexpr std::array<std::pair<u32, const char*>, 5> default_icon_sizes{{
std::make_pair(0, QT_TR_NOOP("None")),
std::make_pair(32, QT_TR_NOOP("Small (32x32)")),
std::make_pair(64, QT_TR_NOOP("Standard (64x64)")),
std::make_pair(128, QT_TR_NOOP("Large (128x128)")),
std::make_pair(256, QT_TR_NOOP("Full Size (256x256)")),
}};
constexpr std::array<const char*, 4> row_text_names{{
QT_TR_NOOP("Filename"),
QT_TR_NOOP("Filetype"),
QT_TR_NOOP("Title ID"),
QT_TR_NOOP("Title Name"),
}};
} // Anonymous namespace
ConfigureGameList::ConfigureGameList(QWidget* parent) ConfigureGameList::ConfigureGameList(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGameList) { : QWidget(parent), ui(new Ui::ConfigureGameList) {
ui->setupUi(this); ui->setupUi(this);
static const std::vector<std::pair<u32, std::string>> default_icon_sizes{ InitializeIconSizeComboBox();
std::make_pair(0, "None"), std::make_pair(32, "Small"), InitializeRowComboBoxes();
std::make_pair(64, "Standard"), std::make_pair(128, "Large"),
std::make_pair(256, "Full Size"),
};
for (const auto& size : default_icon_sizes) {
ui->icon_size_combobox->addItem(QString::fromStdString(size.second + " (" +
std::to_string(size.first) + "x" +
std::to_string(size.first) + ")"),
size.first);
}
static const std::vector<std::string> row_text_names{
"Filename",
"Filetype",
"Title ID",
"Title Name",
};
for (size_t i = 0; i < row_text_names.size(); ++i) {
ui->row_1_text_combobox->addItem(QString::fromStdString(row_text_names[i]),
QVariant::fromValue(i));
ui->row_2_text_combobox->addItem(QString::fromStdString(row_text_names[i]),
QVariant::fromValue(i));
}
this->setConfiguration(); this->setConfiguration();
} }
ConfigureGameList::~ConfigureGameList() {} ConfigureGameList::~ConfigureGameList() = default;
void ConfigureGameList::applyConfiguration() {
UISettings::values.show_unknown = ui->show_unknown->isChecked();
UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
Settings::Apply();
}
void ConfigureGameList::setConfiguration() { void ConfigureGameList::setConfiguration() {
ui->show_unknown->setChecked(UISettings::values.show_unknown); ui->show_unknown->setChecked(UISettings::values.show_unknown);
@ -54,10 +58,39 @@ void ConfigureGameList::setConfiguration() {
ui->row_2_text_combobox->findData(UISettings::values.row_2_text_id)); ui->row_2_text_combobox->findData(UISettings::values.row_2_text_id));
} }
void ConfigureGameList::applyConfiguration() { void ConfigureGameList::changeEvent(QEvent* event) {
UISettings::values.show_unknown = ui->show_unknown->isChecked(); if (event->type() == QEvent::LanguageChange) {
UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt(); RetranslateUI();
UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt(); return;
UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt(); }
Settings::Apply();
QWidget::changeEvent(event);
}
void ConfigureGameList::RetranslateUI() {
ui->retranslateUi(this);
for (int i = 0; i < ui->icon_size_combobox->count(); i++) {
ui->icon_size_combobox->setItemText(i, tr(default_icon_sizes[i].second));
}
for (int i = 0; i < ui->row_1_text_combobox->count(); i++) {
const QString name = tr(row_text_names[i]);
ui->row_1_text_combobox->setItemText(i, name);
ui->row_2_text_combobox->setItemText(i, name);
}
}
void ConfigureGameList::InitializeIconSizeComboBox() {
for (const auto& size : default_icon_sizes) {
ui->icon_size_combobox->addItem(size.second, size.first);
}
}
void ConfigureGameList::InitializeRowComboBoxes() {
for (size_t i = 0; i < row_text_names.size(); ++i) {
ui->row_1_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i));
ui->row_2_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i));
}
} }

View file

@ -23,6 +23,11 @@ public:
private: private:
void setConfiguration(); void setConfiguration();
private: void changeEvent(QEvent*) override;
void RetranslateUI();
void InitializeIconSizeComboBox();
void InitializeRowComboBoxes();
std::unique_ptr<Ui::ConfigureGameList> ui; std::unique_ptr<Ui::ConfigureGameList> ui;
}; };