diff --git a/advancedSettings.pro b/advancedSettings.pro index 88e2033..e6961cf 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -13,71 +13,11 @@ TEMPLATE = app SOURCES += src/main.cpp\ - src/overlaycontroller.cpp \ - src/tabcontrollers/AudioTabController.cpp \ - src/tabcontrollers/ChaperoneTabController.cpp \ - src/tabcontrollers/FixFloorTabController.cpp \ - src/tabcontrollers/MoveCenterTabController.cpp \ - src/tabcontrollers/SettingsTabController.cpp \ - src/tabcontrollers/StatisticsTabController.cpp \ - src/tabcontrollers/SteamVRTabController.cpp \ - src/tabcontrollers/ReviveTabController.cpp \ - src/tabcontrollers/UtilitiesTabController.cpp \ - src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \ - src/tabcontrollers/PttController.cpp \ - src/tabcontrollers/AccessibilityTabController.cpp \ - src/utils/ChaperoneUtils.cpp \ - release/moc_AccessibilityTabController.cpp \ - release/moc_AudioTabController.cpp \ - release/moc_ChaperoneTabController.cpp \ - release/moc_FixFloorTabController.cpp \ - release/moc_MoveCenterTabController.cpp \ - release/moc_overlaycontroller.cpp \ - release/moc_PttController.cpp \ - release/moc_ReviveTabController.cpp \ - release/moc_SettingsTabController.cpp \ - release/moc_StatisticsTabController.cpp \ - release/moc_SteamVRTabController.cpp \ - release/moc_UtilitiesTabController.cpp \ - src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \ - src/tabcontrollers/AccessibilityTabController.cpp \ src/overlaycontroller.cpp \ src/tabcontrollers/AudioTabController.cpp \ src/tabcontrollers/ChaperoneTabController.cpp \ src/tabcontrollers/FixFloorTabController.cpp \ src/tabcontrollers/MoveCenterTabController.cpp \ - src/tabcontrollers/PttController.cpp \ - src/tabcontrollers/ReviveTabController.cpp \ - src/tabcontrollers/SettingsTabController.cpp \ - src/tabcontrollers/StatisticsTabController.cpp \ - src/tabcontrollers/SteamVRTabController.cpp \ - src/tabcontrollers/UtilitiesTabController.cpp \ - src/utils/ChaperoneUtils.cpp \ - src/main.cpp \ - src/overlaycontroller.cpp - -HEADERS += src/overlaycontroller.h \ - src/logging.h \ - src/tabcontrollers/AudioTabController.h \ - src/tabcontrollers/ChaperoneTabController.h \ - src/tabcontrollers/FixFloorTabController.h \ - src/tabcontrollers/MoveCenterTabController.h \ - src/tabcontrollers/SettingsTabController.h \ - src/tabcontrollers/StatisticsTabController.h \ - src/tabcontrollers/SteamVRTabController.h \ - src/tabcontrollers/ReviveTabController.h \ - src/tabcontrollers/UtilitiesTabController.h \ - src/tabcontrollers/AudioManager.h \ - src/tabcontrollers/audiomanager/AudioManagerWindows.h \ - src/tabcontrollers/PttController.h \ - src/tabcontrollers/AccessibilityTabController.h \ - src/utils/Matrix.h \ - src/utils/ChaperoneUtils.h \ - release/moc_predefs.h \ - src/tabcontrollers/audiomanager/AudioManagerWindows.h \ - src/tabcontrollers/audiomanager/IPolicyConfig.h \ - src/tabcontrollers/AccessibilityTabController.h \ - src/tabcontrollers/AudioManager.h \ src/tabcontrollers/SettingsTabController.cpp \ src/tabcontrollers/StatisticsTabController.cpp \ src/tabcontrollers/SteamVRTabController.cpp \ @@ -95,23 +35,6 @@ HEADERS += src/overlaycontroller.h \ src/tabcontrollers/ChaperoneTabController.h \ src/tabcontrollers/FixFloorTabController.h \ src/tabcontrollers/MoveCenterTabController.h \ - src/tabcontrollers/PttController.h \ - src/tabcontrollers/ReviveTabController.h \ - src/tabcontrollers/SettingsTabController.h \ - src/tabcontrollers/StatisticsTabController.h \ - src/tabcontrollers/SteamVRTabController.h \ - src/tabcontrollers/UtilitiesTabController.h \ - src/utils/ChaperoneUtils.h \ - src/utils/Matrix.h \ - src/logging.h \ - src/overlaycontroller.h \ - third-party/easylogging++/easylogging++.h \ - third-party/openvr/bin/osx64/OpenVR.framework/Versions/A/Headers/openvr.h \ - third-party/openvr/bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_capi.h \ - third-party/openvr/bin/osx64/OpenVR.framework/Versions/A/Headers/openvr_driver.h \ - third-party/openvr/headers/openvr.h \ - third-party/openvr/headers/openvr_capi.h \ - third-party/openvr/headers/openvr_driver.h src/tabcontrollers/SettingsTabController.h \ src/tabcontrollers/StatisticsTabController.h \ src/tabcontrollers/SteamVRTabController.h \ @@ -134,49 +57,11 @@ win32 { } INCLUDEPATH += third-party/openvr/headers \ - third-party/easylogging++ + third-party/easylogging++ win32:LIBS += -L"$$PWD/third-party/openvr/lib/win64" -luser32 -lole32 unix:LIBS += -L"$$PWD/third-party/openvr/lib/linux64" LIBS += -lopenvr_api - -DESTDIR = bin/win64/AdvancedSettings - -DISTFILES += \ - src/res/qml/ptt_notification.png \ - src/res/qml/backarrow.svg \ - src/res/qml/check.svg \ - src/res/qml/mic_off.svg \ - src/res/qml/mic_on.svg \ - src/res/qml/ptt_notification.svg \ - src/res/qml/speaker_off.svg \ - src/res/qml/speaker_on.svg \ - src/res/qml/qmldir \ - src/res/qml/AccessibilityPage.qml \ - src/res/qml/AudioPage.qml \ - src/res/qml/ChaperonePage.qml \ - src/res/qml/ChaperoneWarningsPage.qml \ - src/res/qml/FixFloorPage.qml \ - src/res/qml/mainwidget.qml \ - src/res/qml/MyComboBox.qml \ - src/res/qml/MyDialogOkCancelPopup.qml \ - src/res/qml/MyDialogOkPopup.qml \ - src/res/qml/MyPushButton.qml \ - src/res/qml/MyPushButton2.qml \ - src/res/qml/MyResources.qml \ - src/res/qml/MySlider.qml \ - src/res/qml/MyStackViewPage.qml \ - src/res/qml/MyText.qml \ - src/res/qml/MyTextField.qml \ - src/res/qml/MyToggleButton.qml \ - src/res/qml/PlayspacePage.qml \ - src/res/qml/PttControllerConfigDialog.qml \ - src/res/qml/RevivePage.qml \ - src/res/qml/RootPage.qml \ - src/res/qml/SettingsPage.qml \ - src/res/qml/StatisticsPage.qml \ - src/res/qml/SteamVRPage.qml \ - src/res/qml/UtilitiesPage.qml win32:DESTDIR = bin/win64/AdvancedSettings unix:DESTDIR = bin/linux/AdvancedSettings diff --git a/installer/AdvancedSettings-Installer.exe b/installer/AdvancedSettings-Installer.exe index 97059c1..392eca4 100644 Binary files a/installer/AdvancedSettings-Installer.exe and b/installer/AdvancedSettings-Installer.exe differ diff --git a/src/res/qml/PlayspacePage.qml b/src/res/qml/PlayspacePage.qml index 6b7b4e7..9795983 100644 --- a/src/res/qml/PlayspacePage.qml +++ b/src/res/qml/PlayspacePage.qml @@ -360,8 +360,13 @@ MyStackViewPage { playSpaceMoveYText.text = MoveCenterTabController.offsetY.toFixed(2) playSpaceMoveZText.text = MoveCenterTabController.offsetZ.toFixed(2) playspaceRotationSlider.value = MoveCenterTabController.rotation - moveShortcutRight.checked = MoveCenterTabController.moveShortcutRight; - moveShortcutLeft.checked = MoveCenterTabController.moveShortcutLeft; + moveShortcutRight.checked = MoveCenterTabController.moveShortcutRight + moveShortcutLeft.checked = MoveCenterTabController.moveShortcutLeft + lockXToggle.checked = MoveCenterTabController.lockXToggle + lockYToggle.checked = MoveCenterTabController.lockYToggle + lockZToggle.checked = MoveCenterTabController.lockZToggle + requireDoubleClick.checked = MoveCenterTabController.requireDoubleClick + if (MoveCenterTabController.trackingUniverse === 0) { playspaceModeText.text = "Sitting" playSpaceRotationPlusButton.enabled = false @@ -405,6 +410,15 @@ MyStackViewPage { onRequireDoubleClickChanged: { requireDoubleClick.checked = MoveCenterTabController.requireDoubleClick } + onLockXToggleChanged: { + lockXToggle.checked = MoveCenterTabController.lockXToggle + } + onLockYToggleChanged: { + lockYToggle.checked = MoveCenterTabController.lockYToggle + } + onLockZToggleChanged: { + lockZToggle.checked = MoveCenterTabController.lockZToggle + } onTrackingUniverseChanged: { if (MoveCenterTabController.trackingUniverse === 0) { playspaceModeText.text = "Sitting" diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp index d4240ff..f1f5ec6 100644 --- a/src/tabcontrollers/MoveCenterTabController.cpp +++ b/src/tabcontrollers/MoveCenterTabController.cpp @@ -41,6 +41,18 @@ void MoveCenterTabController::initStage1() { if (value.isValid() && !value.isNull()) { m_requireDoubleClick = value.toBool(); } + value = settings->value("lockXToggle", m_lockXToggle); + if (value.isValid() && !value.isNull()) { + m_lockXToggle = value.toBool(); + } + value = settings->value("lockYToggle", m_lockYToggle); + if (value.isValid() && !value.isNull()) { + m_lockYToggle = value.toBool(); + } + value = settings->value("lockZToggle", m_lockZToggle); + if (value.isValid() && !value.isNull()) { + m_lockZToggle = value.toBool(); + } settings->endGroup(); lastMoveButtonClick[0] = lastMoveButtonClick[0] = clock::now(); } @@ -214,7 +226,7 @@ void MoveCenterTabController::setLockY(bool value, bool notify) { m_lockYToggle = value; auto settings = OverlayController::appSettings(); settings->beginGroup("playspaceSettings"); - settings->setValue("lockYToggle", m_lockXToggle); + settings->setValue("lockYToggle", m_lockYToggle); settings->endGroup(); settings->sync(); if (notify) {