From f4f64cc1971236ba5758057d6a572551a6a94eb2 Mon Sep 17 00:00:00 2001
From: muemart <muemart@users.noreply.github.com>
Date: Fri, 8 Dec 2017 13:03:43 +0100
Subject: [PATCH 1/3] Add button labels for sdl joystick mappings

---
 src/yuzu/configuration/configure_input.cpp | 63 ++++++++++++++++------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index cd7520f29..af735196d 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -166,34 +166,63 @@ void ConfigureInput::restoreDefaults() {
 }
 
 void ConfigureInput::updateButtonLabels() {
-    QString non_keyboard(tr("[non-keyboard]"));
+    QString unknown_mapping(tr("[unknown]"));
 
-    auto KeyToText = [&non_keyboard](const Common::ParamPackage& param) {
+    auto ButtonToText = [&unknown_mapping](const Common::ParamPackage& param) {
         if (!param.Has("engine")) {
             return QString("[not set]");
-        } else if (param.Get("engine", "") != "keyboard") {
-            return non_keyboard;
-        } else {
+        } else if (param.Get("engine", "") == "keyboard") {
             return getKeyName(param.Get("code", 0));
+        } else if (param.Get("engine", "") == "sdl") {
+            QString text = QString("Joystick %1").arg(param.Get("joystick", "").c_str());
+            if (param.Has("hat")) {
+                text += QString(" Hat %1 %2")
+                            .arg(param.Get("hat", "").c_str(), param.Get("direction", "").c_str());
+            }
+            if (param.Has("axis")) {
+                text += QString(" Axis %1%2")
+                            .arg(param.Get("axis", "").c_str(), param.Get("direction", "").c_str());
+            }
+            if (param.Has("button")) {
+                text += QString(" Button %1").arg(param.Get("button", "").c_str());
+            }
+            return text;
+        } else {
+            return unknown_mapping;
+        }
+    };
+    auto AnalogToText = [&unknown_mapping, &ButtonToText](const Common::ParamPackage& param,
+                                                          const std::string& dir) {
+        if (!param.Has("engine")) {
+            return QString("[not set]");
+        } else if (param.Get("engine", "") == "analog_from_button") {
+            return ButtonToText(Common::ParamPackage{param.Get(dir, "")});
+        } else if (param.Get("engine", "") == "sdl") {
+            if (dir == "modifier") {
+                return QString("[unused]");
+            }
+
+            QString text = QString("Joystick %1").arg(param.Get("joystick", "").c_str());
+            if (dir == "left" || dir == "right") {
+                text += QString(" Axis %1").arg(param.Get("axis_x", "").c_str());
+            } else if (dir == "up" || dir == "down") {
+                text += QString(" Axis %1").arg(param.Get("axis_y", "").c_str());
+            }
+            return text;
+        } else {
+            return unknown_mapping;
         }
     };
 
     for (int button = 0; button < Settings::NativeButton::NumButtons; button++) {
-        button_map[button]->setText(KeyToText(buttons_param[button]));
+        button_map[button]->setText(ButtonToText(buttons_param[button]));
     }
 
     for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) {
-        if (analogs_param[analog_id].Get("engine", "") != "analog_from_button") {
-            for (QPushButton* button : analog_map_buttons[analog_id]) {
-                if (button)
-                    button->setText(non_keyboard);
-            }
-        } else {
-            for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
-                Common::ParamPackage param(
-                    analogs_param[analog_id].Get(analog_sub_buttons[sub_button_id], ""));
-                if (analog_map_buttons[analog_id][sub_button_id])
-                    analog_map_buttons[analog_id][sub_button_id]->setText(KeyToText(param));
+        for (int sub_button_id = 0; sub_button_id < ANALOG_SUB_BUTTONS_NUM; sub_button_id++) {
+            if (analog_map_buttons[analog_id][sub_button_id]) {
+                analog_map_buttons[analog_id][sub_button_id]->setText(
+                    AnalogToText(analogs_param[analog_id], analog_sub_buttons[sub_button_id]));
             }
         }
         analog_map_stick[analog_id]->setText("Set Analog Stick");

From 5d5f1dfb68289d4ad9b5720c16a8844fac0a9738 Mon Sep 17 00:00:00 2001
From: muemart <muemart@users.noreply.github.com>
Date: Sat, 9 Dec 2017 16:11:17 +0100
Subject: [PATCH 2/3] Add translation support for button labels

---
 src/yuzu/configuration/configure_input.cpp | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index af735196d..bcb91b636 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -167,46 +167,47 @@ void ConfigureInput::restoreDefaults() {
 
 void ConfigureInput::updateButtonLabels() {
     QString unknown_mapping(tr("[unknown]"));
+    QString mapping_not_set(tr("[not set]"));
 
-    auto ButtonToText = [&unknown_mapping](const Common::ParamPackage& param) {
+    auto ButtonToText = [&unknown_mapping, &mapping_not_set](const Common::ParamPackage& param) {
         if (!param.Has("engine")) {
-            return QString("[not set]");
+            return mapping_not_set;
         } else if (param.Get("engine", "") == "keyboard") {
             return getKeyName(param.Get("code", 0));
         } else if (param.Get("engine", "") == "sdl") {
-            QString text = QString("Joystick %1").arg(param.Get("joystick", "").c_str());
+            QString text = QString(tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
             if (param.Has("hat")) {
-                text += QString(" Hat %1 %2")
+                text += QString(tr(" Hat %1 %2"))
                             .arg(param.Get("hat", "").c_str(), param.Get("direction", "").c_str());
             }
             if (param.Has("axis")) {
-                text += QString(" Axis %1%2")
+                text += QString(tr(" Axis %1%2"))
                             .arg(param.Get("axis", "").c_str(), param.Get("direction", "").c_str());
             }
             if (param.Has("button")) {
-                text += QString(" Button %1").arg(param.Get("button", "").c_str());
+                text += QString(tr(" Button %1")).arg(param.Get("button", "").c_str());
             }
             return text;
         } else {
             return unknown_mapping;
         }
     };
-    auto AnalogToText = [&unknown_mapping, &ButtonToText](const Common::ParamPackage& param,
-                                                          const std::string& dir) {
+    auto AnalogToText = [&unknown_mapping, &mapping_not_set,
+                         &ButtonToText](const Common::ParamPackage& param, const std::string& dir) {
         if (!param.Has("engine")) {
-            return QString("[not set]");
+            return mapping_not_set;
         } else if (param.Get("engine", "") == "analog_from_button") {
             return ButtonToText(Common::ParamPackage{param.Get(dir, "")});
         } else if (param.Get("engine", "") == "sdl") {
             if (dir == "modifier") {
-                return QString("[unused]");
+                return QString(tr("[unused]"));
             }
 
-            QString text = QString("Joystick %1").arg(param.Get("joystick", "").c_str());
+            QString text = QString(tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
             if (dir == "left" || dir == "right") {
-                text += QString(" Axis %1").arg(param.Get("axis_x", "").c_str());
+                text += QString(tr(" Axis %1")).arg(param.Get("axis_x", "").c_str());
             } else if (dir == "up" || dir == "down") {
-                text += QString(" Axis %1").arg(param.Get("axis_y", "").c_str());
+                text += QString(tr(" Axis %1")).arg(param.Get("axis_y", "").c_str());
             }
             return text;
         } else {
@@ -225,7 +226,7 @@ void ConfigureInput::updateButtonLabels() {
                     AnalogToText(analogs_param[analog_id], analog_sub_buttons[sub_button_id]));
             }
         }
-        analog_map_stick[analog_id]->setText("Set Analog Stick");
+        analog_map_stick[analog_id]->setText(tr("Set Analog Stick"));
     }
 }
 

From aec3b28547c4f7bf1bd94340dd423b49df9e3db0 Mon Sep 17 00:00:00 2001
From: muemart <muemart@users.noreply.github.com>
Date: Wed, 13 Dec 2017 19:06:14 +0100
Subject: [PATCH 3/3] Use static functions instead of lambdas

---
 src/yuzu/configuration/configure_input.cpp | 95 +++++++++++-----------
 1 file changed, 46 insertions(+), 49 deletions(-)

diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index bcb91b636..0a67c3180 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -42,6 +42,52 @@ static void SetAnalogButton(const Common::ParamPackage& input_param,
     analog_param.Set(button_name, input_param.Serialize());
 }
 
+static QString ButtonToText(const Common::ParamPackage& param) {
+    if (!param.Has("engine")) {
+        return QObject::tr("[not set]");
+    } else if (param.Get("engine", "") == "keyboard") {
+        return getKeyName(param.Get("code", 0));
+    } else if (param.Get("engine", "") == "sdl") {
+        QString text = QString(QObject::tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
+        if (param.Has("hat")) {
+            text += QString(QObject::tr(" Hat %1 %2"))
+                        .arg(param.Get("hat", "").c_str(), param.Get("direction", "").c_str());
+        }
+        if (param.Has("axis")) {
+            text += QString(QObject::tr(" Axis %1%2"))
+                        .arg(param.Get("axis", "").c_str(), param.Get("direction", "").c_str());
+        }
+        if (param.Has("button")) {
+            text += QString(QObject::tr(" Button %1")).arg(param.Get("button", "").c_str());
+        }
+        return text;
+    } else {
+        return QObject::tr("[unknown]");
+    }
+};
+
+static QString AnalogToText(const Common::ParamPackage& param, const std::string& dir) {
+    if (!param.Has("engine")) {
+        return QObject::tr("[not set]");
+    } else if (param.Get("engine", "") == "analog_from_button") {
+        return ButtonToText(Common::ParamPackage{param.Get(dir, "")});
+    } else if (param.Get("engine", "") == "sdl") {
+        if (dir == "modifier") {
+            return QString(QObject::tr("[unused]"));
+        }
+
+        QString text = QString(QObject::tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
+        if (dir == "left" || dir == "right") {
+            text += QString(QObject::tr(" Axis %1")).arg(param.Get("axis_x", "").c_str());
+        } else if (dir == "up" || dir == "down") {
+            text += QString(QObject::tr(" Axis %1")).arg(param.Get("axis_y", "").c_str());
+        }
+        return text;
+    } else {
+        return QObject::tr("[unknown]");
+    }
+};
+
 ConfigureInput::ConfigureInput(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()),
       timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()) {
@@ -166,55 +212,6 @@ void ConfigureInput::restoreDefaults() {
 }
 
 void ConfigureInput::updateButtonLabels() {
-    QString unknown_mapping(tr("[unknown]"));
-    QString mapping_not_set(tr("[not set]"));
-
-    auto ButtonToText = [&unknown_mapping, &mapping_not_set](const Common::ParamPackage& param) {
-        if (!param.Has("engine")) {
-            return mapping_not_set;
-        } else if (param.Get("engine", "") == "keyboard") {
-            return getKeyName(param.Get("code", 0));
-        } else if (param.Get("engine", "") == "sdl") {
-            QString text = QString(tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
-            if (param.Has("hat")) {
-                text += QString(tr(" Hat %1 %2"))
-                            .arg(param.Get("hat", "").c_str(), param.Get("direction", "").c_str());
-            }
-            if (param.Has("axis")) {
-                text += QString(tr(" Axis %1%2"))
-                            .arg(param.Get("axis", "").c_str(), param.Get("direction", "").c_str());
-            }
-            if (param.Has("button")) {
-                text += QString(tr(" Button %1")).arg(param.Get("button", "").c_str());
-            }
-            return text;
-        } else {
-            return unknown_mapping;
-        }
-    };
-    auto AnalogToText = [&unknown_mapping, &mapping_not_set,
-                         &ButtonToText](const Common::ParamPackage& param, const std::string& dir) {
-        if (!param.Has("engine")) {
-            return mapping_not_set;
-        } else if (param.Get("engine", "") == "analog_from_button") {
-            return ButtonToText(Common::ParamPackage{param.Get(dir, "")});
-        } else if (param.Get("engine", "") == "sdl") {
-            if (dir == "modifier") {
-                return QString(tr("[unused]"));
-            }
-
-            QString text = QString(tr("Joystick %1")).arg(param.Get("joystick", "").c_str());
-            if (dir == "left" || dir == "right") {
-                text += QString(tr(" Axis %1")).arg(param.Get("axis_x", "").c_str());
-            } else if (dir == "up" || dir == "down") {
-                text += QString(tr(" Axis %1")).arg(param.Get("axis_y", "").c_str());
-            }
-            return text;
-        } else {
-            return unknown_mapping;
-        }
-    };
-
     for (int button = 0; button < Settings::NativeButton::NumButtons; button++) {
         button_map[button]->setText(ButtonToText(buttons_param[button]));
     }