Qt: Add new controller image and icon refinement

stenzek · Oct 19, 2023 · 2ca3322 · 2ca3322
1 parent 2df88e7
commit 2ca3322
Show file tree

Hide file tree

Showing 13 changed files with 723 additions and 333 deletions.
diff --git a/src/duckstation-qt/controllerbindingwidget.ui b/src/duckstation-qt/controllerbindingwidget.ui
@@ -134,7 +134,7 @@
            <string>Clear Mapping</string>
           </property>
           <property name="icon">
-           <iconset theme="file-reduce-line">
+           <iconset theme="trash-fill">
             <normaloff>.</normaloff>.</iconset>
           </property>
           <property name="toolButtonStyle">

diff --git a/src/duckstation-qt/controllerbindingwidget_analog_controller.ui b/src/duckstation-qt/controllerbindingwidget_analog_controller.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1100</width>
-    <height>500</height>
+    <width>1202</width>
+    <height>646</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -40,19 +40,6 @@
    </property>
    <item row="0" column="0" rowspan="3">
     <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <spacer name="verticalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QGroupBox" name="groupBox">
        <property name="title">
@@ -448,12 +435,12 @@
    </item>
    <item row="0" column="1">
     <layout class="QGridLayout" name="gridLayout_27">
-     <item row="1" column="1">
-      <widget class="QGroupBox" name="groupBox_25">
+     <item row="0" column="3">
+      <widget class="QGroupBox" name="groupBox_23">
        <property name="title">
-        <string>Select</string>
+        <string>R2</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_25">
+       <layout class="QGridLayout" name="gridLayout_23">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -467,7 +454,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="Select">
+         <widget class="InputBindingWidget" name="R2">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -482,12 +469,12 @@
        </layout>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QGroupBox" name="groupBox_22">
+     <item row="0" column="1">
+      <widget class="QGroupBox" name="groupBox_25">
        <property name="title">
-        <string>L1</string>
+        <string>Select</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_22">
+       <layout class="QGridLayout" name="gridLayout_25">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -501,7 +488,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="L1">
+         <widget class="InputBindingWidget" name="Select">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -516,12 +503,12 @@
        </layout>
       </widget>
      </item>
-     <item row="2" column="3">
-      <widget class="QGroupBox" name="groupBox_24">
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="groupBox_21">
        <property name="title">
-        <string>R1</string>
+        <string>L2</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_24">
+       <layout class="QGridLayout" name="gridLayout_21">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -535,7 +522,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="R1">
+         <widget class="InputBindingWidget" name="L2">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -550,12 +537,12 @@
        </layout>
       </widget>
      </item>
-     <item row="1" column="3">
-      <widget class="QGroupBox" name="groupBox_23">
+     <item row="0" column="2">
+      <widget class="QGroupBox" name="groupBox_26">
        <property name="title">
-        <string>R2</string>
+        <string>Start</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_23">
+       <layout class="QGridLayout" name="gridLayout_26">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -569,7 +556,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="R2">
+         <widget class="InputBindingWidget" name="Start">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -584,12 +571,12 @@
        </layout>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QGroupBox" name="groupBox_21">
+     <item row="1" column="3">
+      <widget class="QGroupBox" name="groupBox_24">
        <property name="title">
-        <string>L2</string>
+        <string>R1</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_21">
+       <layout class="QGridLayout" name="gridLayout_24">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -603,7 +590,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="L2">
+         <widget class="InputBindingWidget" name="R1">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -618,12 +605,12 @@
        </layout>
       </widget>
      </item>
-     <item row="1" column="2">
-      <widget class="QGroupBox" name="groupBox_26">
+     <item row="1" column="0">
+      <widget class="QGroupBox" name="groupBox_22">
        <property name="title">
-        <string>Start</string>
+        <string>L1</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout_26">
+       <layout class="QGridLayout" name="gridLayout_22">
         <property name="leftMargin">
          <number>6</number>
         </property>
@@ -637,7 +624,7 @@
          <number>6</number>
         </property>
         <item row="0" column="0">
-         <widget class="InputBindingWidget" name="Start">
+         <widget class="InputBindingWidget" name="L1">
           <property name="maximumSize">
            <size>
             <width>100</width>
@@ -652,36 +639,10 @@
        </layout>
       </widget>
      </item>
-     <item row="0" column="1">
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item row="0" column="2" rowspan="3">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <spacer name="verticalSpacer_6">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QGroupBox" name="groupBox_16">
        <property name="title">
@@ -1265,7 +1226,7 @@
  </customwidgets>
  <resources>
   <include location="resources/resources.qrc"/>
-  <include location="../resources/resources.qrc"/>
+  <include location="resources/resources.qrc"/>
  </resources>
  <connections/>
 </ui>