Clean up offsets tab ui

src/res/qml/PlayspacePage.qml

@@ -6,7 +6,7 @@ import "common"
 
 
 MyStackViewPage {
-    headerText: "Space Settings"
+    headerText: "Space Offsets"
 
     content: ColumnLayout {
         spacing: 18
@@ -314,19 +314,6 @@ MyStackViewPage {
                             }
                        }
                     }
-
-                    MyToggleButton {
-                        id: spaceRotateHandToggle
-                        text: "Enable Space-Turn Binding"
-                        onCheckedChanged: {
-                            MoveCenterTabController.rotateHand = this.checked
-                        }
-                    }
-
-                    MyText {
-                        text: "Note: TurnSignal will ignore turning during Space-Turn rotation."
-                        font.pointSize: 15.0
-                    }
                 }
             }
         }
@@ -344,27 +331,6 @@ MyStackViewPage {
                 border.color: "#ffffff"
                 radius: 8
             }
-            ColumnLayout {
-                RowLayout {
-                    Layout.fillWidth: true
-
-                    MyToggleButton {
-                        id: moveShortcutLeft
-                        text: "Enable Left Hand"
-                        onCheckedChanged: {
-                            MoveCenterTabController.moveShortcutLeft = this.checked
-                        }
-                    }
-
-                    MyToggleButton {
-                        id: moveShortcutRight
-                        text: "Enable Right Hand"
-                        onCheckedChanged: {
-                            MoveCenterTabController.moveShortcutRight = this.checked
-                        }
-                    }
-                }
-            }
         }
 
         ColumnLayout {
@@ -397,13 +363,10 @@ MyStackViewPage {
 
         Component.onCompleted: {
             spaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
-            spaceRotateHandToggle.checked = MoveCenterTabController.rotateHand
             spaceMoveXText.text = MoveCenterTabController.offsetX.toFixed(2)
             spaceMoveYText.text = MoveCenterTabController.offsetY.toFixed(2)
             spaceMoveZText.text = MoveCenterTabController.offsetZ.toFixed(2)
             spaceRotationSlider.value = MoveCenterTabController.rotation
-            moveShortcutRight.checked = MoveCenterTabController.moveShortcutRight
-            moveShortcutLeft.checked = MoveCenterTabController.moveShortcutLeft
 			lockXToggle.checked = MoveCenterTabController.lockXToggle
 			lockYToggle.checked = MoveCenterTabController.lockYToggle
 			lockZToggle.checked = MoveCenterTabController.lockZToggle
@@ -445,15 +408,6 @@ MyStackViewPage {
             }
             onAdjustChaperoneChanged: {
                 spaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
-            }
-            onRotateHandChanged: {
-                spaceRotateHandToggle.checked = MoveCenterTabController.rotateHand
-            }
-            onMoveShortcutRightChanged: {
-                moveShortcutRight.checked = MoveCenterTabController.moveShortcutRight
-            }
-            onMoveShortcutLeftChanged: {
-                moveShortcutLeft.checked = MoveCenterTabController.moveShortcutLeft
             }
 			onLockXToggleChanged: {
 				lockXToggle.checked = MoveCenterTabController.lockXToggle

src/tabcontrollers/MoveCenterTabController.cpp

@@ -46,11 +46,6 @@ void MoveCenterTabController::initStage1()
     {
         m_adjustChaperone = value.toBool();
     }
-    value = settings->value( "rotateHand", m_settingsHandTurningEnabled );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_settingsHandTurningEnabled = value.toBool();
-    }
     value = settings->value( "moveShortcutRight",
                              m_settingsRightHandDragEnabled );
     if ( value.isValid() && !value.isNull() )
@@ -283,25 +278,6 @@ void MoveCenterTabController::setAdjustChaperone( bool value, bool notify )
     }
 }
 
-bool MoveCenterTabController::rotateHand() const
-{
-    return m_settingsHandTurningEnabled;
-}
-
-void MoveCenterTabController::setRotateHand( bool value, bool notify )
-{
-    m_settingsHandTurningEnabled = value;
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "playspaceSettings" );
-    settings->setValue( "rotateHand", m_settingsHandTurningEnabled );
-    settings->endGroup();
-    settings->sync();
-    if ( notify )
-    {
-        emit rotateHandChanged( m_settingsHandTurningEnabled );
-    }
-}
-
 bool MoveCenterTabController::moveShortcutRight() const
 {
     return m_settingsRightHandDragEnabled;

src/tabcontrollers/MoveCenterTabController.h

@@ -66,8 +66,6 @@ class MoveCenterTabController : public QObject
                     requireLockYChanged )
     Q_PROPERTY( bool lockZToggle READ lockZToggle WRITE setLockZ NOTIFY
                     requireLockZChanged )
-    Q_PROPERTY( bool rotateHand READ rotateHand WRITE setRotateHand NOTIFY
-                    rotateHandChanged )
 
 private:
     OverlayController* parent;
@@ -84,7 +82,6 @@ private:
     int m_oldRotation = 0;
     int m_tempRotation = 0;
     bool m_adjustChaperone = true;
-    bool m_settingsHandTurningEnabled = false;
     bool m_moveShortcutRightPressed = false;
     bool m_moveShortcutLeftPressed = false;
     vr::TrackedDeviceIndex_t m_activeMoveController;
@@ -174,7 +171,6 @@ public:
     int rotation() const;
     int tempRotation() const;
     bool adjustChaperone() const;
-    bool rotateHand() const;
     bool moveShortcutRight() const;
     bool moveShortcutLeft() const;
     bool turnBindRight() const;
@@ -228,8 +224,6 @@ public slots:
 
     void setAdjustChaperone( bool value, bool notify = true );
 
-    void setRotateHand( bool value, bool notify = true );
-
     void setMoveShortcutRight( bool value, bool notify = true );
     void setMoveShortcutLeft( bool value, bool notify = true );
     void setTurnBindRight( bool value, bool notify = true );
@@ -262,7 +256,6 @@ signals:
     void rotationChanged( int value );
     void tempRotationChanged( int value );
     void adjustChaperoneChanged( bool value );
-    void rotateHandChanged( bool value );
     void moveShortcutRightChanged( bool value );
     void moveShortcutLeftChanged( bool value );
     void turnBindRightChanged( bool value );