From f4f6f6dfc5a8f4af0e79c96f3ac72433612f6015 Mon Sep 17 00:00:00 2001
From: Rayyan Ansari <rayyan@ansari.sh>
Date: Fri, 4 Mar 2022 17:52:49 +0000
Subject: InputConfig: change Group Box titles to Labels

On GNOME, the Group Box's titles don't align with the text in the buttons.
This commit removes the Group Box titles and instead uses Labels to fix this.
---
 .../qt_sdl/InputConfig/InputConfigDialog.ui        | 1188 ++++++++++++--------
 1 file changed, 714 insertions(+), 474 deletions(-)

(limited to 'src/frontend/qt_sdl')

diff --git a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
index 6f4bb5d..15cb683 100644
--- a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
+++ b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>710</width>
-    <height>709</height>
+    <width>770</width>
+    <height>719</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -82,13 +82,128 @@
        <string>DS keypad</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="1" column="0">
+       <item row="0" column="0">
         <widget class="QStackedWidget" name="stackMapping">
          <property name="currentIndex">
           <number>0</number>
          </property>
          <widget class="QWidget" name="keyPage">
           <layout class="QGridLayout" name="gridLayout_2">
+           <item row="4" column="1" colspan="3">
+            <layout class="QHBoxLayout" name="horizontalLayout_3">
+             <item>
+              <spacer name="horizontalSpacer">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QPushButton" name="btnJoyMapSwitch">
+               <property name="text">
+                <string>Switch to Joystick mappings</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_2">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item row="1" column="3">
+            <widget class="QWidget" name="widget_4" native="true">
+             <layout class="QHBoxLayout" name="horizontalLayout_15">
+              <item>
+               <widget class="QGroupBox" name="grp_R">
+                <property name="title">
+                 <string/>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+                <layout class="QVBoxLayout" name="verticalLayout">
+                 <property name="spacing">
+                  <number>3</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>3</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>3</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>3</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>3</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_8">
+                   <property name="text">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;R&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="btnKeyR">
+                   <property name="minimumSize">
+                    <size>
+                     <width>76</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>68</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="styleSheet">
+                    <string notr="true">min-width: 68px;</string>
+                   </property>
+                   <property name="text">
+                    <string>R</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_8">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item row="1" column="1">
             <widget class="QWidget" name="widget_3" native="true">
              <layout class="QHBoxLayout" name="horizontalLayout_14">
@@ -108,12 +223,12 @@
               <item>
                <widget class="QGroupBox" name="grp_L">
                 <property name="title">
-                 <string>L</string>
+                 <string/>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
                 </property>
-                <layout class="QHBoxLayout" name="horizontalLayout_5">
+                <layout class="QVBoxLayout" name="verticalLayout_4">
                  <property name="spacing">
                   <number>3</number>
                  </property>
@@ -129,11 +244,21 @@
                  <property name="bottomMargin">
                   <number>3</number>
                  </property>
+                 <item>
+                  <widget class="QLabel" name="label_9">
+                   <property name="text">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;L&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QPushButton" name="btnKeyL">
                    <property name="minimumSize">
                     <size>
-                     <width>72</width>
+                     <width>76</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -157,32 +282,6 @@
              </layout>
             </widget>
            </item>
-           <item row="1" column="2">
-            <widget class="QLabel" name="label_3">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="resources/ds.qrc">:/ds/ds_back.svg</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="2">
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="resources/ds.qrc">:/ds/ds_open.svg</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
            <item row="2" column="3">
             <widget class="QGroupBox" name="grp_ABXY">
              <property name="sizePolicy">
@@ -250,7 +349,7 @@
                  <item alignment="Qt::AlignHCenter">
                   <widget class="QGroupBox" name="grp_X">
                    <property name="title">
-                    <string>X</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
@@ -271,11 +370,21 @@
                     <property name="bottomMargin">
                      <number>3</number>
                     </property>
+                    <item>
+                     <widget class="QLabel" name="label_13">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;X&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
                     <item>
                      <widget class="QPushButton" name="btnKeyX">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -320,7 +429,7 @@
                 <item alignment="Qt::AlignHCenter">
                  <widget class="QGroupBox" name="grp_Y">
                   <property name="title">
-                   <string>Y</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -341,11 +450,21 @@
                    <property name="bottomMargin">
                     <number>3</number>
                    </property>
+                   <item>
+                    <widget class="QLabel" name="label_15">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Y&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
                    <item>
                     <widget class="QPushButton" name="btnKeyY">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -369,7 +488,7 @@
                 <item alignment="Qt::AlignHCenter">
                  <widget class="QGroupBox" name="grp_A">
                   <property name="title">
-                   <string>A</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -390,11 +509,21 @@
                    <property name="bottomMargin">
                     <number>3</number>
                    </property>
+                   <item>
+                    <widget class="QLabel" name="label_16">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;A&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
                    <item>
                     <widget class="QPushButton" name="btnKeyA">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -451,7 +580,7 @@
                  <item alignment="Qt::AlignHCenter">
                   <widget class="QGroupBox" name="grp_B">
                    <property name="title">
-                    <string>B</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
@@ -472,11 +601,21 @@
                     <property name="bottomMargin">
                      <number>3</number>
                     </property>
+                    <item>
+                     <widget class="QLabel" name="label_17">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;B&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
                     <item>
                      <widget class="QPushButton" name="btnKeyB">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -516,99 +655,234 @@
              </layout>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="QGroupBox" name="grp_ControlPad">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string/>
-             </property>
-             <property name="flat">
-              <bool>false</bool>
-             </property>
-             <property name="checkable">
-              <bool>false</bool>
+           <item row="3" column="2">
+            <layout class="QHBoxLayout" name="layout_SelectStart">
+             <property name="spacing">
+              <number>3</number>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_5">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <property name="leftMargin">
-               <number>3</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>3</number>
-              </property>
-              <property name="bottomMargin">
-               <number>3</number>
-              </property>
-              <item>
-               <widget class="QWidget" name="widget_Up" native="true">
-                <layout class="QHBoxLayout" name="horizontalLayout_23">
-                 <property name="spacing">
-                  <number>0</number>
-                 </property>
-                 <property name="leftMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="topMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="rightMargin">
-                  <number>0</number>
-                 </property>
-                 <property name="bottomMargin">
-                  <number>0</number>
-                 </property>
-                 <item>
-                  <spacer name="spacer">
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item alignment="Qt::AlignHCenter">
-                  <widget class="QGroupBox" name="grp_Up">
-                   <property name="title">
-                    <string>Up</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignCenter</set>
-                   </property>
-                   <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout">
-                    <property name="spacing">
-                     <number>3</number>
-                    </property>
-                    <property name="leftMargin">
-                     <number>3</number>
-                    </property>
-                    <property name="topMargin">
-                     <number>3</number>
-                    </property>
-                    <property name="rightMargin">
-                     <number>3</number>
-                    </property>
-                    <property name="bottomMargin">
+             <item alignment="Qt::AlignHCenter">
+              <widget class="QGroupBox" name="grp_Select">
+               <property name="title">
+                <string/>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+               <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout_2">
+                <property name="spacing">
+                 <number>3</number>
+                </property>
+                <property name="leftMargin">
+                 <number>3</number>
+                </property>
+                <property name="topMargin">
+                 <number>3</number>
+                </property>
+                <property name="rightMargin">
+                 <number>3</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>3</number>
+                </property>
+                <item>
+                 <widget class="QLabel" name="label_18">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Select&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="btnKeySelect">
+                  <property name="minimumSize">
+                   <size>
+                    <width>76</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>68</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">min-width: 68px;</string>
+                  </property>
+                  <property name="text">
+                   <string>Select</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item alignment="Qt::AlignHCenter">
+              <widget class="QGroupBox" name="grp_Start">
+               <property name="title">
+                <string/>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+               <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout_2">
+                <property name="spacing">
+                 <number>3</number>
+                </property>
+                <property name="leftMargin">
+                 <number>3</number>
+                </property>
+                <property name="topMargin">
+                 <number>3</number>
+                </property>
+                <property name="rightMargin">
+                 <number>3</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>3</number>
+                </property>
+                <item>
+                 <widget class="QLabel" name="label_19">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Start&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="btnKeyStart">
+                  <property name="minimumSize">
+                   <size>
+                    <width>76</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>68</width>
+                    <height>16777215</height>
+                   </size>
+                  </property>
+                  <property name="styleSheet">
+                   <string notr="true">min-width: 68px;</string>
+                  </property>
+                  <property name="text">
+                   <string>Start</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="2" column="1">
+            <widget class="QGroupBox" name="grp_ControlPad">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="title">
+              <string/>
+             </property>
+             <property name="flat">
+              <bool>false</bool>
+             </property>
+             <property name="checkable">
+              <bool>false</bool>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_5">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <property name="leftMargin">
+               <number>3</number>
+              </property>
+              <property name="topMargin">
+               <number>0</number>
+              </property>
+              <property name="rightMargin">
+               <number>3</number>
+              </property>
+              <property name="bottomMargin">
+               <number>3</number>
+              </property>
+              <item>
+               <widget class="QWidget" name="widget_Up" native="true">
+                <layout class="QHBoxLayout" name="horizontalLayout_23">
+                 <property name="spacing">
+                  <number>0</number>
+                 </property>
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <spacer name="spacer">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>20</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item alignment="Qt::AlignHCenter">
+                  <widget class="QGroupBox" name="grp_Up">
+                   <property name="title">
+                    <string/>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                   <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout">
+                    <property name="spacing">
+                     <number>3</number>
+                    </property>
+                    <property name="leftMargin">
+                     <number>3</number>
+                    </property>
+                    <property name="topMargin">
                      <number>3</number>
                     </property>
+                    <property name="rightMargin">
+                     <number>3</number>
+                    </property>
+                    <property name="bottomMargin">
+                     <number>3</number>
+                    </property>
+                    <item>
+                     <widget class="QLabel" name="label_10">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Up&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
                     <item>
                      <widget class="QPushButton" name="btnKeyUp">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -653,7 +927,7 @@
                 <item alignment="Qt::AlignHCenter">
                  <widget class="QGroupBox" name="grp_Left">
                   <property name="title">
-                   <string>Left</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -674,11 +948,21 @@
                    <property name="bottomMargin">
                     <number>3</number>
                    </property>
+                   <item>
+                    <widget class="QLabel" name="label_11">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Left&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
                    <item>
                     <widget class="QPushButton" name="btnKeyLeft">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -702,7 +986,7 @@
                 <item alignment="Qt::AlignHCenter">
                  <widget class="QGroupBox" name="grp_Right">
                   <property name="title">
-                   <string>Right</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
@@ -723,11 +1007,21 @@
                    <property name="bottomMargin">
                     <number>3</number>
                    </property>
+                   <item>
+                    <widget class="QLabel" name="label_12">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Right&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
                    <item>
                     <widget class="QPushButton" name="btnKeyRight">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -784,7 +1078,7 @@
                  <item alignment="Qt::AlignHCenter">
                   <widget class="QGroupBox" name="grp_Down">
                    <property name="title">
-                    <string>Down</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
@@ -805,11 +1099,21 @@
                     <property name="bottomMargin">
                      <number>3</number>
                     </property>
+                    <item>
+                     <widget class="QLabel" name="label_14">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Down&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
                     <item>
                      <widget class="QPushButton" name="btnKeyDown">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -849,6 +1153,32 @@
              </layout>
             </widget>
            </item>
+           <item row="2" column="2">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="resources/ds.qrc">:/ds/ds_open.svg</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QLabel" name="label_3">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="resources/ds.qrc">:/ds/ds_back.svg</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
            <item row="0" column="2">
             <widget class="QLabel" name="label_7">
              <property name="font">
@@ -864,10 +1194,14 @@
              </property>
             </widget>
            </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="joyPage">
+          <layout class="QGridLayout" name="gridLayout_3">
            <item row="4" column="1" colspan="3">
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <layout class="QHBoxLayout" name="horizontalLayout_12">
              <item>
-              <spacer name="horizontalSpacer">
+              <spacer name="horizontalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -880,14 +1214,14 @@
               </spacer>
              </item>
              <item>
-              <widget class="QPushButton" name="btnJoyMapSwitch">
+              <widget class="QPushButton" name="btnKeyMapSwitch">
                <property name="text">
-                <string>Switch to Joystick mappings</string>
+                <string>Switch to Keyboard mappings</string>
                </property>
               </widget>
              </item>
              <item>
-              <spacer name="horizontalSpacer_2">
+              <spacer name="horizontalSpacer_4">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -901,183 +1235,6 @@
              </item>
             </layout>
            </item>
-           <item row="3" column="2">
-            <layout class="QHBoxLayout" name="layout_SelectStart">
-             <property name="spacing">
-              <number>3</number>
-             </property>
-             <item alignment="Qt::AlignHCenter">
-              <widget class="QGroupBox" name="grp_Select">
-               <property name="title">
-                <string>Select</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-               <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout_2">
-                <property name="spacing">
-                 <number>3</number>
-                </property>
-                <property name="leftMargin">
-                 <number>3</number>
-                </property>
-                <property name="topMargin">
-                 <number>3</number>
-                </property>
-                <property name="rightMargin">
-                 <number>3</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>3</number>
-                </property>
-                <item>
-                 <widget class="QPushButton" name="btnKeySelect">
-                  <property name="minimumSize">
-                   <size>
-                    <width>72</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>68</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="styleSheet">
-                   <string notr="true">min-width: 68px;</string>
-                  </property>
-                  <property name="text">
-                   <string>Select</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-             <item alignment="Qt::AlignHCenter">
-              <widget class="QGroupBox" name="grp_Start">
-               <property name="title">
-                <string>Start</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignCenter</set>
-               </property>
-               <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout_2">
-                <property name="spacing">
-                 <number>3</number>
-                </property>
-                <property name="leftMargin">
-                 <number>3</number>
-                </property>
-                <property name="topMargin">
-                 <number>3</number>
-                </property>
-                <property name="rightMargin">
-                 <number>3</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>3</number>
-                </property>
-                <item>
-                 <widget class="QPushButton" name="btnKeyStart">
-                  <property name="minimumSize">
-                   <size>
-                    <width>72</width>
-                    <height>0</height>
-                   </size>
-                  </property>
-                  <property name="maximumSize">
-                   <size>
-                    <width>68</width>
-                    <height>16777215</height>
-                   </size>
-                  </property>
-                  <property name="styleSheet">
-                   <string notr="true">min-width: 68px;</string>
-                  </property>
-                  <property name="text">
-                   <string>Start</string>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item row="1" column="3">
-            <widget class="QWidget" name="widget_4" native="true">
-             <layout class="QHBoxLayout" name="horizontalLayout_15">
-              <item>
-               <widget class="QGroupBox" name="grp_R">
-                <property name="title">
-                 <string>R</string>
-                </property>
-                <property name="alignment">
-                 <set>Qt::AlignCenter</set>
-                </property>
-                <layout class="QHBoxLayout" name="horizontalLayout_4">
-                 <property name="spacing">
-                  <number>3</number>
-                 </property>
-                 <property name="leftMargin">
-                  <number>3</number>
-                 </property>
-                 <property name="topMargin">
-                  <number>3</number>
-                 </property>
-                 <property name="rightMargin">
-                  <number>3</number>
-                 </property>
-                 <property name="bottomMargin">
-                  <number>3</number>
-                 </property>
-                 <item>
-                  <widget class="QPushButton" name="btnKeyR">
-                   <property name="minimumSize">
-                    <size>
-                     <width>72</width>
-                     <height>0</height>
-                    </size>
-                   </property>
-                   <property name="maximumSize">
-                    <size>
-                     <width>68</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="styleSheet">
-                    <string notr="true">min-width: 68px;</string>
-                   </property>
-                   <property name="text">
-                    <string>R</string>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacer_8">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="joyPage">
-          <layout class="QGridLayout" name="gridLayout_3">
            <item row="1" column="1">
             <widget class="QWidget" name="widget" native="true">
              <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -1097,12 +1254,12 @@
               <item>
                <widget class="QGroupBox" name="grp_L_2">
                 <property name="title">
-                 <string>L</string>
+                 <string/>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
                 </property>
-                <layout class="QHBoxLayout" name="horizontalLayout_9">
+                <layout class="QVBoxLayout" name="verticalLayout_7">
                  <property name="spacing">
                   <number>3</number>
                  </property>
@@ -1118,11 +1275,21 @@
                  <property name="bottomMargin">
                   <number>3</number>
                  </property>
+                 <item>
+                  <widget class="QLabel" name="label_20">
+                   <property name="text">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;L&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QPushButton" name="btnJoyL">
                    <property name="minimumSize">
                     <size>
-                     <width>72</width>
+                     <width>76</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -1146,8 +1313,34 @@
              </layout>
             </widget>
            </item>
-           <item row="2" column="3">
-            <widget class="QGroupBox" name="grp_ABXY_2">
+           <item row="1" column="2">
+            <widget class="QLabel" name="label_4">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="resources/ds.qrc">:/ds/ds_back.svg</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2">
+            <widget class="QLabel" name="label_5">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="pixmap">
+              <pixmap resource="resources/ds.qrc">:/ds/ds_open.svg</pixmap>
+             </property>
+             <property name="scaledContents">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QGroupBox" name="grp_ControlPad_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
@@ -1163,7 +1356,7 @@
              <property name="checkable">
               <bool>false</bool>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_3">
+             <layout class="QVBoxLayout" name="verticalLayout_6">
               <property name="spacing">
                <number>0</number>
               </property>
@@ -1180,8 +1373,8 @@
                <number>3</number>
               </property>
               <item>
-               <widget class="QWidget" name="widget_X_2" native="true">
-                <layout class="QHBoxLayout" name="horizontalLayout_7">
+               <widget class="QWidget" name="widget_Up_2" native="true">
+                <layout class="QHBoxLayout" name="horizontalLayout_25">
                  <property name="spacing">
                   <number>0</number>
                  </property>
@@ -1198,7 +1391,7 @@
                   <number>0</number>
                  </property>
                  <item>
-                  <spacer name="spacer_9">
+                  <spacer name="spacer_13">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1211,14 +1404,14 @@
                   </spacer>
                  </item>
                  <item alignment="Qt::AlignHCenter">
-                  <widget class="QGroupBox" name="grp_X_2">
+                  <widget class="QGroupBox" name="grp_Up_2">
                    <property name="title">
-                    <string>X</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
                    </property>
-                   <layout class="QVBoxLayout" name="buttonFaceButtonsXVerticalLayout_2">
+                   <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout_2">
                     <property name="spacing">
                      <number>3</number>
                     </property>
@@ -1235,10 +1428,20 @@
                      <number>3</number>
                     </property>
                     <item>
-                     <widget class="QPushButton" name="btnJoyX">
+                     <widget class="QLabel" name="label_23">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Up&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QPushButton" name="btnJoyUp">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1252,7 +1455,7 @@
                        <string notr="true">min-width: 68px;</string>
                       </property>
                       <property name="text">
-                       <string>X</string>
+                       <string>Up</string>
                       </property>
                      </widget>
                     </item>
@@ -1260,7 +1463,7 @@
                   </widget>
                  </item>
                  <item>
-                  <spacer name="spacer_10">
+                  <spacer name="spacer_14">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1276,19 +1479,19 @@
                </widget>
               </item>
               <item>
-               <layout class="QHBoxLayout" name="layout_YA_2">
+               <layout class="QHBoxLayout" name="layout_LeftRight_2">
                 <property name="spacing">
                  <number>3</number>
                 </property>
                 <item alignment="Qt::AlignHCenter">
-                 <widget class="QGroupBox" name="grp_Y_2">
+                 <widget class="QGroupBox" name="grp_Left_2">
                   <property name="title">
-                   <string>Y</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
                   </property>
-                  <layout class="QVBoxLayout" name="buttonFaceButtonsYVerticalLayout_2">
+                  <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout_4">
                    <property name="spacing">
                     <number>3</number>
                    </property>
@@ -1305,10 +1508,20 @@
                     <number>3</number>
                    </property>
                    <item>
-                    <widget class="QPushButton" name="btnJoyY">
+                    <widget class="QLabel" name="label_22">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Left&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="btnJoyLeft">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1322,7 +1535,7 @@
                       <string notr="true">min-width: 68px;</string>
                      </property>
                      <property name="text">
-                      <string>Y</string>
+                      <string>Left</string>
                      </property>
                     </widget>
                    </item>
@@ -1330,14 +1543,14 @@
                  </widget>
                 </item>
                 <item alignment="Qt::AlignHCenter">
-                 <widget class="QGroupBox" name="grp_A_2">
+                 <widget class="QGroupBox" name="grp_Right_2">
                   <property name="title">
-                   <string>A</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
                   </property>
-                  <layout class="QVBoxLayout" name="buttonFaceButtonsAVerticalLayout_2">
+                  <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout_4">
                    <property name="spacing">
                     <number>3</number>
                    </property>
@@ -1354,10 +1567,20 @@
                     <number>3</number>
                    </property>
                    <item>
-                    <widget class="QPushButton" name="btnJoyA">
+                    <widget class="QLabel" name="label_30">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Right&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="btnJoyRight">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1371,7 +1594,7 @@
                       <string notr="true">min-width: 68px;</string>
                      </property>
                      <property name="text">
-                      <string>A</string>
+                      <string>Right</string>
                      </property>
                     </widget>
                    </item>
@@ -1381,8 +1604,8 @@
                </layout>
               </item>
               <item>
-               <widget class="QWidget" name="widget_B_2" native="true">
-                <layout class="QHBoxLayout" name="horizontalLayout_11">
+               <widget class="QWidget" name="widget_Down_2" native="true">
+                <layout class="QHBoxLayout" name="horizontalLayout_26">
                  <property name="spacing">
                   <number>0</number>
                  </property>
@@ -1399,7 +1622,7 @@
                   <number>0</number>
                  </property>
                  <item>
-                  <spacer name="spacer_11">
+                  <spacer name="spacer_15">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1412,14 +1635,14 @@
                   </spacer>
                  </item>
                  <item alignment="Qt::AlignHCenter">
-                  <widget class="QGroupBox" name="grp_B_2">
+                  <widget class="QGroupBox" name="grp_Down_2">
                    <property name="title">
-                    <string>B</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
                    </property>
-                   <layout class="QVBoxLayout" name="buttonFaceButtonsBVerticalLayout_2">
+                   <layout class="QVBoxLayout" name="buttonDpadDownVerticalLayout_2">
                     <property name="spacing">
                      <number>3</number>
                     </property>
@@ -1436,10 +1659,20 @@
                      <number>3</number>
                     </property>
                     <item>
-                     <widget class="QPushButton" name="btnJoyB">
+                     <widget class="QLabel" name="label_31">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Down&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QPushButton" name="btnJoyDown">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1453,7 +1686,7 @@
                        <string notr="true">min-width: 68px;</string>
                       </property>
                       <property name="text">
-                       <string>B</string>
+                       <string>Down</string>
                       </property>
                      </widget>
                     </item>
@@ -1461,7 +1694,7 @@
                   </widget>
                  </item>
                  <item>
-                  <spacer name="spacer_12">
+                  <spacer name="spacer_16">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1479,8 +1712,8 @@
              </layout>
             </widget>
            </item>
-           <item row="2" column="1">
-            <widget class="QGroupBox" name="grp_ControlPad_2">
+           <item row="2" column="3">
+            <widget class="QGroupBox" name="grp_ABXY_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
@@ -1496,7 +1729,7 @@
              <property name="checkable">
               <bool>false</bool>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_6">
+             <layout class="QVBoxLayout" name="verticalLayout_3">
               <property name="spacing">
                <number>0</number>
               </property>
@@ -1513,8 +1746,8 @@
                <number>3</number>
               </property>
               <item>
-               <widget class="QWidget" name="widget_Up_2" native="true">
-                <layout class="QHBoxLayout" name="horizontalLayout_25">
+               <widget class="QWidget" name="widget_X_2" native="true">
+                <layout class="QHBoxLayout" name="horizontalLayout_7">
                  <property name="spacing">
                   <number>0</number>
                  </property>
@@ -1531,7 +1764,7 @@
                   <number>0</number>
                  </property>
                  <item>
-                  <spacer name="spacer_13">
+                  <spacer name="spacer_9">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1544,14 +1777,14 @@
                   </spacer>
                  </item>
                  <item alignment="Qt::AlignHCenter">
-                  <widget class="QGroupBox" name="grp_Up_2">
+                  <widget class="QGroupBox" name="grp_X_2">
                    <property name="title">
-                    <string>Up</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
                    </property>
-                   <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout_2">
+                   <layout class="QVBoxLayout" name="buttonFaceButtonsXVerticalLayout_2">
                     <property name="spacing">
                      <number>3</number>
                     </property>
@@ -1568,10 +1801,20 @@
                      <number>3</number>
                     </property>
                     <item>
-                     <widget class="QPushButton" name="btnJoyUp">
+                     <widget class="QLabel" name="label_24">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;X&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QPushButton" name="btnJoyX">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1585,7 +1828,7 @@
                        <string notr="true">min-width: 68px;</string>
                       </property>
                       <property name="text">
-                       <string>Up</string>
+                       <string>X</string>
                       </property>
                      </widget>
                     </item>
@@ -1593,7 +1836,7 @@
                   </widget>
                  </item>
                  <item>
-                  <spacer name="spacer_14">
+                  <spacer name="spacer_10">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1609,19 +1852,19 @@
                </widget>
               </item>
               <item>
-               <layout class="QHBoxLayout" name="layout_LeftRight_2">
+               <layout class="QHBoxLayout" name="layout_YA_2">
                 <property name="spacing">
                  <number>3</number>
                 </property>
                 <item alignment="Qt::AlignHCenter">
-                 <widget class="QGroupBox" name="grp_Left_2">
+                 <widget class="QGroupBox" name="grp_Y_2">
                   <property name="title">
-                   <string>Left</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
                   </property>
-                  <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout_4">
+                  <layout class="QVBoxLayout" name="buttonFaceButtonsYVerticalLayout_2">
                    <property name="spacing">
                     <number>3</number>
                    </property>
@@ -1638,10 +1881,20 @@
                     <number>3</number>
                    </property>
                    <item>
-                    <widget class="QPushButton" name="btnJoyLeft">
+                    <widget class="QLabel" name="label_25">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Y&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="btnJoyY">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1655,7 +1908,7 @@
                       <string notr="true">min-width: 68px;</string>
                      </property>
                      <property name="text">
-                      <string>Left</string>
+                      <string>Y</string>
                      </property>
                     </widget>
                    </item>
@@ -1663,14 +1916,14 @@
                  </widget>
                 </item>
                 <item alignment="Qt::AlignHCenter">
-                 <widget class="QGroupBox" name="grp_Right_2">
+                 <widget class="QGroupBox" name="grp_A_2">
                   <property name="title">
-                   <string>Right</string>
+                   <string/>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignCenter</set>
                   </property>
-                  <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout_4">
+                  <layout class="QVBoxLayout" name="buttonFaceButtonsAVerticalLayout_2">
                    <property name="spacing">
                     <number>3</number>
                    </property>
@@ -1687,10 +1940,20 @@
                     <number>3</number>
                    </property>
                    <item>
-                    <widget class="QPushButton" name="btnJoyRight">
+                    <widget class="QLabel" name="label_26">
+                     <property name="text">
+                      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;A&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="btnJoyA">
                      <property name="minimumSize">
                       <size>
-                       <width>72</width>
+                       <width>76</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1704,7 +1967,7 @@
                       <string notr="true">min-width: 68px;</string>
                      </property>
                      <property name="text">
-                      <string>Right</string>
+                      <string>A</string>
                      </property>
                     </widget>
                    </item>
@@ -1714,8 +1977,8 @@
                </layout>
               </item>
               <item>
-               <widget class="QWidget" name="widget_Down_2" native="true">
-                <layout class="QHBoxLayout" name="horizontalLayout_26">
+               <widget class="QWidget" name="widget_B_2" native="true">
+                <layout class="QHBoxLayout" name="horizontalLayout_11">
                  <property name="spacing">
                   <number>0</number>
                  </property>
@@ -1732,7 +1995,7 @@
                   <number>0</number>
                  </property>
                  <item>
-                  <spacer name="spacer_15">
+                  <spacer name="spacer_11">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1745,14 +2008,14 @@
                   </spacer>
                  </item>
                  <item alignment="Qt::AlignHCenter">
-                  <widget class="QGroupBox" name="grp_Down_2">
+                  <widget class="QGroupBox" name="grp_B_2">
                    <property name="title">
-                    <string>Down</string>
+                    <string/>
                    </property>
                    <property name="alignment">
                     <set>Qt::AlignCenter</set>
                    </property>
-                   <layout class="QVBoxLayout" name="buttonDpadDownVerticalLayout_2">
+                   <layout class="QVBoxLayout" name="buttonFaceButtonsBVerticalLayout_2">
                     <property name="spacing">
                      <number>3</number>
                     </property>
@@ -1769,10 +2032,20 @@
                      <number>3</number>
                     </property>
                     <item>
-                     <widget class="QPushButton" name="btnJoyDown">
+                     <widget class="QLabel" name="label_27">
+                      <property name="text">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;B&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QPushButton" name="btnJoyB">
                       <property name="minimumSize">
                        <size>
-                        <width>72</width>
+                        <width>76</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1786,7 +2059,7 @@
                        <string notr="true">min-width: 68px;</string>
                       </property>
                       <property name="text">
-                       <string>Down</string>
+                       <string>B</string>
                       </property>
                      </widget>
                     </item>
@@ -1794,7 +2067,7 @@
                   </widget>
                  </item>
                  <item>
-                  <spacer name="spacer_16">
+                  <spacer name="spacer_12">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
                    </property>
@@ -1812,84 +2085,6 @@
              </layout>
             </widget>
            </item>
-           <item row="2" column="2">
-            <widget class="QLabel" name="label_5">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="resources/ds.qrc">:/ds/ds_open.svg</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <widget class="QLabel" name="label_6">
-             <property name="font">
-              <font>
-               <pointsize>15</pointsize>
-              </font>
-             </property>
-             <property name="text">
-              <string>Joystick mappings</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="2">
-            <widget class="QLabel" name="label_4">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="resources/ds.qrc">:/ds/ds_back.svg</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1" colspan="3">
-            <layout class="QHBoxLayout" name="horizontalLayout_12">
-             <item>
-              <spacer name="horizontalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item>
-              <widget class="QPushButton" name="btnKeyMapSwitch">
-               <property name="text">
-                <string>Switch to Keyboard mappings</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
            <item row="3" column="2">
             <layout class="QHBoxLayout" name="layout_SelectStart_2">
              <property name="spacing">
@@ -1898,7 +2093,7 @@
              <item alignment="Qt::AlignHCenter">
               <widget class="QGroupBox" name="grp_Select_2">
                <property name="title">
-                <string>Select</string>
+                <string/>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1919,11 +2114,21 @@
                 <property name="bottomMargin">
                  <number>3</number>
                 </property>
+                <item>
+                 <widget class="QLabel" name="label_28">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Select&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <widget class="QPushButton" name="btnJoySelect">
                   <property name="minimumSize">
                    <size>
-                    <width>72</width>
+                    <width>76</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -1947,7 +2152,7 @@
              <item alignment="Qt::AlignHCenter">
               <widget class="QGroupBox" name="grp_Start_2">
                <property name="title">
-                <string>Start</string>
+                <string/>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1968,11 +2173,21 @@
                 <property name="bottomMargin">
                  <number>3</number>
                 </property>
+                <item>
+                 <widget class="QLabel" name="label_29">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Start&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <widget class="QPushButton" name="btnJoyStart">
                   <property name="minimumSize">
                    <size>
-                    <width>72</width>
+                    <width>76</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -2001,12 +2216,12 @@
               <item>
                <widget class="QGroupBox" name="grp_R_2">
                 <property name="title">
-                 <string>R</string>
+                 <string/>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
                 </property>
-                <layout class="QHBoxLayout" name="horizontalLayout_8">
+                <layout class="QVBoxLayout" name="verticalLayout_8">
                  <property name="spacing">
                   <number>3</number>
                  </property>
@@ -2022,11 +2237,21 @@
                  <property name="bottomMargin">
                   <number>3</number>
                  </property>
+                 <item>
+                  <widget class="QLabel" name="label_21">
+                   <property name="text">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;R&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                  </widget>
+                 </item>
                  <item>
                   <widget class="QPushButton" name="btnJoyR">
                    <property name="minimumSize">
                     <size>
-                     <width>72</width>
+                     <width>76</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -2063,6 +2288,21 @@
              </layout>
             </widget>
            </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="label_6">
+             <property name="font">
+              <font>
+               <pointsize>15</pointsize>
+              </font>
+             </property>
+             <property name="text">
+              <string>Joystick mappings</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>
-- 
cgit v1.2.3