From a8f3a13a1f8c7ffbef0c3b8376bb5ba99e69f4cc Mon Sep 17 00:00:00 2001
From: Kewlan
Date: Sun, 29 Mar 2020 14:37:23 +0200
Subject: Re-order the shoulder buttons both in the configuration menu, and in
 the code.

---
 src/yuzu/configuration/configure_input_player.ui | 72 ++++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 1556481d0..c3a1b68f0 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -839,21 +839,21 @@
         <bool>false</bool>
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
-        <item row="3" column="0">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsSLVerticalLayout">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsSLHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsLHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelSL">
+             <widget class="QLabel" name="labelL">
               <property name="text">
-               <string>SL:</string>
+               <string>L:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonSL">
+           <widget class="QPushButton" name="buttonL">
             <property name="text">
              <string/>
             </property>
@@ -861,21 +861,21 @@
           </item>
          </layout>
         </item>
-        <item row="2" column="1">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
+        <item row="0" column="1">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsZRHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsRHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelZR">
+             <widget class="QLabel" name="labelR">
               <property name="text">
-               <string>ZR:</string>
+               <string>R:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonZR">
+           <widget class="QPushButton" name="buttonR">
             <property name="text">
              <string/>
             </property>
@@ -883,21 +883,21 @@
           </item>
          </layout>
         </item>
-        <item row="3" column="1">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsSRVerticalLayout">
+        <item row="1" column="0">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsSRHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsZLHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelSR">
+             <widget class="QLabel" name="labelZL">
               <property name="text">
-               <string>SR:</string>
+               <string>ZL:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonSR">
+           <widget class="QPushButton" name="buttonZL">
             <property name="text">
              <string/>
             </property>
@@ -905,21 +905,21 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="1">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
+        <item row="1" column="1">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsZLHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsZRHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelZL">
+             <widget class="QLabel" name="labelZR">
               <property name="text">
-               <string>ZL:</string>
+               <string>ZR:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonZL">
+           <widget class="QPushButton" name="buttonZR">
             <property name="text">
              <string/>
             </property>
@@ -927,21 +927,21 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="0">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
+        <item row="2" column="0">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsSLVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsLHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsSLHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelL">
+             <widget class="QLabel" name="labelSL">
               <property name="text">
-               <string>L:</string>
+               <string>SL:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonL">
+           <widget class="QPushButton" name="buttonSL">
             <property name="text">
              <string/>
             </property>
@@ -949,21 +949,21 @@
           </item>
          </layout>
         </item>
-        <item row="2" column="0">
-         <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
+        <item row="2" column="1">
+         <layout class="QVBoxLayout" name="buttonShoulderButtonsSRVerticalLayout">
           <item>
-           <layout class="QHBoxLayout" name="buttonShoulderButtonsRHorizontalLayout">
+           <layout class="QHBoxLayout" name="buttonShoulderButtonsSRHorizontalLayout">
             <item>
-             <widget class="QLabel" name="labelR">
+             <widget class="QLabel" name="labelSR">
               <property name="text">
-               <string>R:</string>
+               <string>SR:</string>
               </property>
              </widget>
             </item>
            </layout>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonR">
+           <widget class="QPushButton" name="buttonSR">
             <property name="text">
              <string/>
             </property>
-- 
cgit v1.2.3