From 65f1aff453227269ca14ea89d8d747e22ff21a35 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 15 Sep 2022 23:49:10 +0200
Subject: [PATCH] more UI work: make it explicit that some things are
 instance-unique

---
 src/frontend/qt_sdl/AudioSettingsDialog.cpp   |  10 ++
 src/frontend/qt_sdl/AudioSettingsDialog.ui    |  11 +-
 .../qt_sdl/FirmwareSettingsDialog.cpp         |   2 +-
 .../qt_sdl/InputConfig/InputConfigDialog.cpp  |   7 +
 .../qt_sdl/InputConfig/InputConfigDialog.ui   | 145 +++++++++---------
 5 files changed, 103 insertions(+), 72 deletions(-)

diff --git a/src/frontend/qt_sdl/AudioSettingsDialog.cpp b/src/frontend/qt_sdl/AudioSettingsDialog.cpp
index a9b3ade7..dc07d3d2 100644
--- a/src/frontend/qt_sdl/AudioSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/AudioSettingsDialog.cpp
@@ -67,6 +67,16 @@ AudioSettingsDialog::AudioSettingsDialog(QWidget* parent) : QDialog(parent), ui(
     bool iswav = (Config::MicInputType == 3);
     ui->txtMicWavPath->setEnabled(iswav);
     ui->btnMicWavBrowse->setEnabled(iswav);
+
+    int inst = Platform::InstanceID();
+    if (inst > 0)
+    {
+        ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
+        ui->cbInterpolation->setEnabled(false);
+        ui->cbBitrate->setEnabled(false);
+    }
+    else
+        ui->lblInstanceNum->hide();
 }
 
 AudioSettingsDialog::~AudioSettingsDialog()
diff --git a/src/frontend/qt_sdl/AudioSettingsDialog.ui b/src/frontend/qt_sdl/AudioSettingsDialog.ui
index d7cfadd6..8fc38d92 100644
--- a/src/frontend/qt_sdl/AudioSettingsDialog.ui
+++ b/src/frontend/qt_sdl/AudioSettingsDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>482</width>
-    <height>256</height>
+    <height>301</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -23,6 +23,13 @@
    <property name="sizeConstraint">
     <enum>QLayout::SetFixedSize</enum>
    </property>
+   <item>
+    <widget class="QLabel" name="lblInstanceNum">
+     <property name="text">
+      <string>Configuring settings for instance X</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -76,7 +83,7 @@
       <item row="1" column="1">
        <widget class="QComboBox" name="cbBitrate">
         <property name="whatsThis">
-			<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bitrate of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The bitrate of audio playback. If set to &quot;Automatic&quot; this will be 10-bit for DS mode and 16-bit for DSi mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
index 7643c1e4..ffca5676 100644
--- a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
@@ -18,8 +18,8 @@
 
 #include <QMessageBox>
 
-#include "Config.h"
 #include "Platform.h"
+#include "Config.h"
 
 #include "FirmwareSettingsDialog.h"
 #include "ui_FirmwareSettingsDialog.h"
diff --git a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
index 697e983a..92a01867 100644
--- a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
+++ b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.cpp
@@ -24,6 +24,7 @@
 #include <SDL2/SDL.h>
 
 #include "types.h"
+#include "Platform.h"
 #include "Config.h"
 
 #include "MapButton.h"
@@ -123,6 +124,12 @@ InputConfigDialog::InputConfigDialog(QWidget* parent) : QDialog(parent), ui(new
     }
 
     setupKeypadPage();
+
+    int inst = Platform::InstanceID();
+    if (inst > 0)
+        ui->lblInstanceNum->setText(QString("Configuring mappings for instance %1").arg(inst+1));
+    else
+        ui->lblInstanceNum->hide();
 }
 
 InputConfigDialog::~InputConfigDialog()
diff --git a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
index 15cb683d..0db61b15 100644
--- a/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
+++ b/src/frontend/qt_sdl/InputConfig/InputConfigDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>770</width>
-    <height>719</height>
+    <height>678</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <property name="sizeConstraint">
     <enum>QLayout::SetFixedSize</enum>
    </property>
-   <item row="7" column="1">
+   <item row="8" column="1">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -30,49 +30,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <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>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Joystick:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="cbxJoystick">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="whatsThis">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects which joystick will be used for joystick input, if any is present.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -167,7 +125,7 @@
                   <widget class="QPushButton" name="btnKeyR">
                    <property name="minimumSize">
                     <size>
-                     <width>76</width>
+                     <width>70</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -258,7 +216,7 @@
                   <widget class="QPushButton" name="btnKeyL">
                    <property name="minimumSize">
                     <size>
-                     <width>76</width>
+                     <width>70</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -384,7 +342,7 @@
                      <widget class="QPushButton" name="btnKeyX">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -464,7 +422,7 @@
                     <widget class="QPushButton" name="btnKeyY">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -523,7 +481,7 @@
                     <widget class="QPushButton" name="btnKeyA">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -615,7 +573,7 @@
                      <widget class="QPushButton" name="btnKeyB">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -698,7 +656,7 @@
                  <widget class="QPushButton" name="btnKeySelect">
                   <property name="minimumSize">
                    <size>
-                    <width>76</width>
+                    <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -757,7 +715,7 @@
                  <widget class="QPushButton" name="btnKeyStart">
                   <property name="minimumSize">
                    <size>
-                    <width>76</width>
+                    <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -882,7 +840,7 @@
                      <widget class="QPushButton" name="btnKeyUp">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -962,7 +920,7 @@
                     <widget class="QPushButton" name="btnKeyLeft">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1021,7 +979,7 @@
                     <widget class="QPushButton" name="btnKeyRight">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1113,7 +1071,7 @@
                      <widget class="QPushButton" name="btnKeyDown">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1289,7 +1247,7 @@
                   <widget class="QPushButton" name="btnJoyL">
                    <property name="minimumSize">
                     <size>
-                     <width>76</width>
+                     <width>70</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -1441,7 +1399,7 @@
                      <widget class="QPushButton" name="btnJoyUp">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1521,7 +1479,7 @@
                     <widget class="QPushButton" name="btnJoyLeft">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1580,7 +1538,7 @@
                     <widget class="QPushButton" name="btnJoyRight">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1672,7 +1630,7 @@
                      <widget class="QPushButton" name="btnJoyDown">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1814,7 +1772,7 @@
                      <widget class="QPushButton" name="btnJoyX">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -1894,7 +1852,7 @@
                     <widget class="QPushButton" name="btnJoyY">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -1953,7 +1911,7 @@
                     <widget class="QPushButton" name="btnJoyA">
                      <property name="minimumSize">
                       <size>
-                       <width>76</width>
+                       <width>70</width>
                        <height>0</height>
                       </size>
                      </property>
@@ -2045,7 +2003,7 @@
                      <widget class="QPushButton" name="btnJoyB">
                       <property name="minimumSize">
                        <size>
-                        <width>76</width>
+                        <width>70</width>
                         <height>0</height>
                        </size>
                       </property>
@@ -2128,7 +2086,7 @@
                  <widget class="QPushButton" name="btnJoySelect">
                   <property name="minimumSize">
                    <size>
-                    <width>76</width>
+                    <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -2187,7 +2145,7 @@
                  <widget class="QPushButton" name="btnJoyStart">
                   <property name="minimumSize">
                    <size>
-                    <width>76</width>
+                    <width>70</width>
                     <height>0</height>
                    </size>
                   </property>
@@ -2251,7 +2209,7 @@
                   <widget class="QPushButton" name="btnJoyR">
                    <property name="minimumSize">
                     <size>
-                     <width>76</width>
+                     <width>70</width>
                      <height>0</height>
                     </size>
                    </property>
@@ -2321,6 +2279,55 @@
      </widget>
     </widget>
    </item>
+   <item row="7" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <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>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Joystick:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="cbxJoystick">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="whatsThis">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Selects which joystick will be used for joystick input, if any is present.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lblInstanceNum">
+     <property name="text">
+      <string>Configuring mappings for instance X</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>