Center Marker/ Chaperone Refactor/ IVROverlay/IVRSettings wrappers PT 1/? (#438)

* changed click noises to internal sounds * udpated to ovr 1.11.11 * in prog added prototypes * began wrapper for IVRSettings * added getters for chaperone colors * added setters for chaperone color * fixed type conversion issue * fixed linking issue, added additional settings chaperone page * adjusted chaperone page qml * added color chaperone UI * refactor in prog * updated ivrsettings wrapper, refactor in prog * refactor in prog * collision bound style add * refactor * cleaned up error logging * fixed fade distance remember bug * fixed sounds * fixed brightness opacity bug setting to 0 when 0 * fixed sounds * added wrapper for removing keys * refactored reset * added chaperone Styles to UI * added chaperone floor always on * fixed copy/paste error * adjsuted ui chaperone color slider * started adding chaperone floor marker * fixeed naming error overlay * finalized chaperone Ideas, added chaperone markers * began ivroverlay wrapper * center marker fully implemented * added function prototypes for new settings * added setting, and updated ui for New Center Marker Overlay * adjsuted sound effect volume and formatting for chaperonecolorbox * adjusted volume back * fixed various issues aroudn new overlay * removed artifact comment * cleaned up settings wrapper * cleaned up chaperone tab controller for namespace changes * removed ide comment issue * cleanup overlay wrapper * cleaned up tab/space changed file name * renamed files * fixed include statements * updated namespace in chaperonetabcontroller * fixed tab/space issues * re-activated boundbasisheight * fixed bulgarian case * changed chaperone warnings to only work in roomscale * fix capitilization * fixed tracking universe update * direct text input change for brightness * qml fixes * fixed qml format issues * fixed sound issue w/ sliders * fixed super truely * Add SDL libraries to CircleCI * Remove -tidy from circleCI config * flushed out error messages in overlaywrapper * removed hungarian notation * added get/set string to ovrsettings wrapper * misc cleanup * add reset orientation btn and new center marker to chaperone * ui adjustments * changed alarm audio * adjusted sound effect volume slightly lower * updated for 5.1.0 release Co-authored-by: Vasily <vautkin@teknik.io>
2020-05-13 15:11:20 -05:00
parent 593b429641
commit a803ffaeac
50 changed files with 1824 additions and 429 deletions
@@ -0,0 +1,24 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+
+RadioButton {
+    hoverEnabled: true
+    contentItem: MyText {
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        text: parent.text
+        color: parent.enabled ? "#ffffff" : "#909090"
+    }
+    onHoveredChanged: {
+        if (hovered) {
+            forceActiveFocus()
+        } else {
+            focus = false
+        }
+    }
+
+    onClicked: {
+		MyResources.playActivationSound()
+    }
+}
@@ -48,7 +48,7 @@ Slider {

    onValueChanged: {
 		if (activeFocus) {
-			MyResources.playActivationSound()
+            //MyResources.playActivationSound()
 		}
    }
 }
@@ -9,6 +9,7 @@ import "../video_page"
 import "../chaperone_page"
 import "../steamvr_page"
 import "../rotation_page"
+import "../chaperone_page/chaperone_additional"

 Rectangle {
    id: root
@@ -35,6 +36,11 @@ Rectangle {
        visible: false
    }

+    property ChaperoneAdditionalPage chaperoneAdditionalPage: ChaperoneAdditionalPage{
+        stackView: mainView
+        visible: false
+    }
+
    property PlayspacePage playspacePage: PlayspacePage {
        stackView: mainView
        visible: false