From 2cd04f906e2eabf8748e8e78998b924e854224ac Mon Sep 17 00:00:00 2001
From: matzman666 <matzman@matzman.net>
Date: Mon, 30 Jan 2017 20:50:55 +0100
Subject: [PATCH] Some GUI layout corrections, some tidying up, and it's better
 to make PttController::getSettingsName() pure virtual.

---
 bin/win64/res/qml/PlayspacePage.qml          | 38 ++++++++------------
 installer/uninstallFiles.list                |  1 +
 src/tabcontrollers/AudioTabController.h      |  6 ----
 src/tabcontrollers/MoveCenterTabController.h |  6 ----
 src/tabcontrollers/PttController.h           |  3 +-
 5 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/bin/win64/res/qml/PlayspacePage.qml b/bin/win64/res/qml/PlayspacePage.qml
index 706b116..6111a3d 100644
--- a/bin/win64/res/qml/PlayspacePage.qml
+++ b/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 {
-            Layout.fillWidth: true
-
-            RowLayout {
-                MyToggleButton {
-                    id: playspaceAdjustChaperoneToggle
-                    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()
-                    }
-                }
+        MyPushButton {
+            id: playspaceResetButton
+            Layout.preferredWidth: 250
+            text: "Reset"
+            onClicked: {
+                MoveCenterTabController.reset()
             }
         }
 
diff --git a/installer/uninstallFiles.list b/installer/uninstallFiles.list
index 6ea3392..4bd3f10 100644
--- a/installer/uninstallFiles.list
+++ b/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
diff --git a/src/tabcontrollers/AudioTabController.h b/src/tabcontrollers/AudioTabController.h
index 4469682..6eab364 100644
--- a/src/tabcontrollers/AudioTabController.h
+++ b/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
diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h
index 3d62f23..6a1c67e 100644
--- a/src/tabcontrollers/MoveCenterTabController.h
+++ b/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
diff --git a/src/tabcontrollers/PttController.h b/src/tabcontrollers/PttController.h
index 8fe0051..0079a74 100644
--- a/src/tabcontrollers/PttController.h
+++ b/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() {};