Some GUI layout corrections, some tidying up, and it's better to make PttController::getSettingsName() pure virtual.

bin/win64/res/qml/PlayspacePage.qml

@@ -339,31 +339,23 @@ MyStackViewPage {
             }
         }
 
+        MyToggleButton {
+            id: playspaceAdjustChaperoneToggle
+            text: "Adjust Chaperone"
+            Layout.preferredWidth: 270
+            onCheckedChanged: {
+                MoveCenterTabController.adjustChaperone = this.checked
+            }
+        }
+
         Item { Layout.fillHeight: true; Layout.fillWidth: true}
 
-        ColumnLayout {
+        MyPushButton {
-            Layout.fillWidth: true
+            id: playspaceResetButton
-
+            Layout.preferredWidth: 250
-            RowLayout {
+            text: "Reset"
-                MyToggleButton {
+            onClicked: {
-                    id: playspaceAdjustChaperoneToggle
+                MoveCenterTabController.reset()
-                    text: "Adjust Chaperone"
-                    Layout.preferredWidth: 250
-                    onCheckedChanged: {
-                        MoveCenterTabController.adjustChaperone = this.checked
-                    }
-                }
-
-                Item { Layout.fillWidth: true}
-
-                MyPushButton {
-                    id: playspaceResetButton
-                    Layout.preferredWidth: 250
-                    text: "Reset"
-                    onClicked: {
-                        MoveCenterTabController.reset()
-                    }
-                }
             }
         }
 

installer/uninstallFiles.list

@@ -405,6 +405,7 @@ Delete $INSTDIR\res\qml\MyText.qml
 Delete $INSTDIR\res\qml\MyTextField.qml
 Delete $INSTDIR\res\qml\MyToggleButton.qml
 Delete $INSTDIR\res\qml\PlayspacePage.qml
+Delete $INSTDIR\res\qml\PttControllerConfigDialog.qml
 Delete $INSTDIR\res\qml\ptt_notification.png
 Delete $INSTDIR\res\qml\ptt_notification.svg
 Delete $INSTDIR\res\qml\qmldir

src/tabcontrollers/AudioTabController.h

@@ -3,13 +3,7 @@
 
 #include "AudioManager.h"
 #include "PttController.h"
-#include <QObject>
-#include <QString>
-#include <QVariant>
-#include <string>
 #include <memory>
-#include <mutex>
-#include <openvr.h>
 
 class QQuickWindow;
 // application namespace

src/tabcontrollers/MoveCenterTabController.h

@@ -1,13 +1,7 @@
 
 #pragma once
 
-#include "AudioTabController.h"
 #include "PttController.h"
-#include <QObject>
-#include <QString>
-#include <QVariant>
-#include <openvr.h>
-#include <mutex>
 
 class QQuickWindow;
 // application namespace

src/tabcontrollers/PttController.h

@@ -5,7 +5,6 @@
 #include <QString>
 #include <QVariant>
 #include <string>
-#include <memory>
 #include <mutex>
 #include <openvr.h>
 
@@ -61,7 +60,7 @@ namespace advsettings {
 
  protected:
     void checkPttStatus();
-	virtual QString getSettingsName() { return "pttSettings"; }
+	virtual QString getSettingsName() = 0;
 	virtual void onPttStart() {};
 	virtual void onPttStop() {};
     virtual void onPttEnabled() {};