diff options
Diffstat (limited to 'src/yuzu/configuration')
| -rw-r--r-- | src/yuzu/configuration/configure_input_simple.cpp | 19 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_per_general.cpp | 4 | 
2 files changed, 9 insertions, 14 deletions
| diff --git a/src/yuzu/configuration/configure_input_simple.cpp b/src/yuzu/configuration/configure_input_simple.cpp index b4f3724bd..07d71e9d1 100644 --- a/src/yuzu/configuration/configure_input_simple.cpp +++ b/src/yuzu/configuration/configure_input_simple.cpp @@ -3,12 +3,8 @@  // Refer to the license.txt file included.  #include <array> -#include <cstring> -#include <functional>  #include <tuple> -#include <QDialog> -  #include "ui_configure_input_simple.h"  #include "yuzu/configuration/configure_input.h"  #include "yuzu/configuration/configure_input_player.h" @@ -73,20 +69,18 @@ void DualJoyconsDockedOnProfileSelect() {  // Name, OnProfileSelect (called when selected in drop down), OnConfigure (called when configure  // is clicked) -using InputProfile = -    std::tuple<QString, std::function<void()>, std::function<void(ConfigureInputSimple*)>>; +using InputProfile = std::tuple<const char*, void (*)(), void (*)(ConfigureInputSimple*)>; -const std::array<InputProfile, 3> INPUT_PROFILES{{ -    {ConfigureInputSimple::tr("Single Player - Handheld - Undocked"), HandheldOnProfileSelect, +constexpr std::array<InputProfile, 3> INPUT_PROFILES{{ +    {QT_TR_NOOP("Single Player - Handheld - Undocked"), HandheldOnProfileSelect,       [](ConfigureInputSimple* caller) {           CallConfigureDialog<ConfigureInputPlayer>(caller, HANDHELD_INDEX, false);       }}, -    {ConfigureInputSimple::tr("Single Player - Dual Joycons - Docked"), -     DualJoyconsDockedOnProfileSelect, +    {QT_TR_NOOP("Single Player - Dual Joycons - Docked"), DualJoyconsDockedOnProfileSelect,       [](ConfigureInputSimple* caller) {           CallConfigureDialog<ConfigureInputPlayer>(caller, 1, false);       }}, -    {ConfigureInputSimple::tr("Custom"), [] {}, CallConfigureDialog<ConfigureInput>}, +    {QT_TR_NOOP("Custom"), [] {}, CallConfigureDialog<ConfigureInput>},  }};  } // namespace @@ -101,7 +95,8 @@ ConfigureInputSimple::ConfigureInputSimple(QWidget* parent)      ui->setupUi(this);      for (const auto& profile : INPUT_PROFILES) { -        ui->profile_combobox->addItem(std::get<0>(profile), std::get<0>(profile)); +        const QString label = tr(std::get<0>(profile)); +        ui->profile_combobox->addItem(label, label);      }      connect(ui->profile_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, diff --git a/src/yuzu/configuration/configure_per_general.cpp b/src/yuzu/configuration/configure_per_general.cpp index 80109b434..5ca493b6d 100644 --- a/src/yuzu/configuration/configure_per_general.cpp +++ b/src/yuzu/configuration/configure_per_general.cpp @@ -47,8 +47,8 @@ ConfigurePerGameGeneral::ConfigurePerGameGeneral(QWidget* parent, u64 title_id)      tree_view->setContextMenuPolicy(Qt::NoContextMenu);      item_model->insertColumns(0, 2); -    item_model->setHeaderData(0, Qt::Horizontal, "Patch Name"); -    item_model->setHeaderData(1, Qt::Horizontal, "Version"); +    item_model->setHeaderData(0, Qt::Horizontal, tr("Patch Name")); +    item_model->setHeaderData(1, Qt::Horizontal, tr("Version"));      // We must register all custom types with the Qt Automoc system so that we are able to use it      // with signals/slots. In this case, QList falls under the umbrells of custom types. | 
