SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.6.2 (#612)

Browse Source 
* add nlhomann json header

* add get scene app fn

* add get current binding and related logic

* add save binding file to settings folder

* apply binding fn added fixed uid bug

* add button logic to QML, add enable Bind Setting

* add finding logic for all custom bind

* fix minor qml issues

* fix get controllername bug, fix bug with save bind

* fix regex issue

* change webrequest for selectconfig

* change to properly urlify path to send

* fix race condition web requests

* change steamvr tab qml formatting

* change color scheme

* change colors of icons to text color

* change bind qml better for better ux

* add possible workaround for space drag issues

* add deact color to pushbutton

* increment version

* adjust button size in movecenter

* move nlhomann json

* fix PKGBUILD to include missing dependency (#606) (#613)

It turns out qt5-websockets needs to be included for a successful build.

Co-authored-by: James R <71466513+ColdIce1605@users.noreply.github.com>

* fix warning

* improved logging messages around perapp bindings

* improve getsceneappID logging

* add HMD based controller Finding

* improve logging controller name

* change logging around initial chaperone calibration

* increment version

* improve logging/error handling around sceneappid failures

* added fallback for getting scene app by pid

* update version string

* update documentation

Co-authored-by: James R <71466513+ColdIce1605@users.noreply.github.com>
This commit is contained in:
ykeara
2022-07-28 16:44:22 -05:00
committed by GitHub
co-authored by James R
parent 3be11339b9
commit 65b5aace06
102 changed files with 23168 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/common/FullWidthSliderBox.qml
+1 -1
View File
@@ -34,7 +34,7 @@ GroupBox {
}
background: Rectangle {
color: "transparent"
border.color: "#ffffff"
border.color: "#d9dbe0"
radius: 8
}
src/res/qml/common/HourComboBox.qml
+2 -2
View File
@@ -40,10 +40,10 @@ MyComboBox {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: parent.pressed ? "#406288" : (parent.hovered ? "#365473" : "#2c435d")
color: parent.pressed ? "#282b31" : (parent.hovered ? "#484f5b" : "#2a2e35")
}
}
}
src/res/qml/common/LineSeparator.qml
+1 -1
View File
@@ -8,7 +8,7 @@ import ".."
// Insert inside a ColumnLayout containing this and a RowLayout
// to neatly separate header and buttons.
Rectangle {
color: "#ffffff"
color: "#d9dbe0"
height: 1
Layout.fillWidth: true
Layout.bottomMargin: 5
src/res/qml/common/MinuteSecondComboBox.qml
+2 -2
View File
@@ -76,10 +76,10 @@ MyComboBox {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: parent.pressed ? "#406288" : (parent.hovered ? "#365473" : "#2c435d")
color: parent.pressed ? "#282b31" : (parent.hovered ? "#484f5b" : "#2a2e35")
}
}
}
src/res/qml/common/MyComboBox.qml
+4 -4
View File
@@ -7,7 +7,7 @@ ComboBox {
id: myComboBox
hoverEnabled: true
background: Rectangle {
color: parent.pressed ? "#406288" : (parent.activeFocus ? "#365473" : "#2c435d")
color: parent.pressed ? "#181a1e" : (parent.activeFocus ? "#586170" : "#3d4450")
}
contentItem: MyText {
@@ -27,10 +27,10 @@ ComboBox {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: parent.pressed ? "#406288" : (parent.hovered ? "#365473" : "#2c435d")
color: parent.pressed ? "#181a1e" : (parent.hovered ? "#586170" : "#3d4450")
}
}
@@ -68,6 +68,6 @@ ComboBox {
}
Component.onCompleted: {
popup.background.color = "#2c435d"
popup.background.color = "#2a2e35"
}
}
src/res/qml/common/MyDialogOkCancelPopup.qml
+3 -3
View File
@@ -35,8 +35,8 @@ Popup {
implicitHeight: dialogHeight
anchors.centerIn: parent
radius: 24
color: "#1b2939"
border.color: "#cccccc"
color: "#2a2e35"
border.color: "#d9dbe0"
border.width: 2
ColumnLayout {
anchors.fill: parent
@@ -47,7 +47,7 @@ Popup {
text: dialogTitle
}
Rectangle {
color: "#cccccc"
color: "#2a2e35"
height: 1
Layout.fillWidth: true
}
src/res/qml/common/MyDialogOkPopup.qml
+3 -3
View File
@@ -35,8 +35,8 @@ Popup {
implicitHeight: dialogHeight
anchors.centerIn: parent
radius: 24
color: "#1b2939"
border.color: "#cccccc"
color: "#2a2e35"
border.color: "#d9dbe0"
border.width: 2
ColumnLayout {
anchors.fill: parent
@@ -47,7 +47,7 @@ Popup {
text: dialogTitle
}
Rectangle {
color: "#cccccc"
color: "#2a2e35"
height: 1
Layout.fillWidth: true
}
src/res/qml/common/MyPushButton.qml
+2 -2
View File
@@ -13,10 +13,10 @@ Button {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: parent.down ? "#406288" : (parent.activeFocus ? "#365473" : "#2c435d")
color: parent.enabled? (parent.down ? "#181a1e" : (parent.activeFocus ? "#586170" : "#3d4450")): "#181a1e"
}
Image {
src/res/qml/common/MyPushButton2.qml
+3 -3
View File
@@ -8,11 +8,11 @@ Button {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: parent.down ? "#406288" : (parent.activeFocus ? "#365473" : "transparent")
border.color: parent.enabled ? "#ffffff" : "#909090"
color: parent.down ? "#282b31" : (parent.activeFocus ? "#484f5b" : "transparent")
border.color: parent.enabled ? "#d9dbe0" : "#65676b"
radius: 8
}
onHoveredChanged: {
src/res/qml/common/MyRadioButton.qml
+1 -1
View File
@@ -8,7 +8,7 @@ RadioButton {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: parent.text
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
onHoveredChanged: {
if (hovered) {
src/res/qml/common/MySlider.qml
+4 -4
View File
@@ -17,14 +17,14 @@ Slider {
width: parent.availableWidth
height: parent.availableHeight
radius: 2
color: parent.activeFocus ? "#2c435d" : "#1b2939"
color: parent.activeFocus ? "#484f5b" : "#2a2e35"
Rectangle {
y: parent.height / 2 - height / 2
implicitHeight: 4
width: parent.width
height: implicitHeight
radius: 2
color: "#bdbebf"
color: "#181a1e"
}
}
@@ -34,8 +34,8 @@ Slider {
implicitWidth: 20
implicitHeight: 40
radius: 4
color: parent.pressed ? "#ffffff" : "#eeeeee"
border.color: "#bdbebf"
color: parent.pressed ? "#586170" : "#3d4450"
border.color: "#181a1e"
}
onHoveredChanged: {
src/res/qml/common/MyStackViewPage.qml
+2 -2
View File
@@ -6,7 +6,7 @@ import "." // QTBUG-34418, singletons require explicit import to load qmldir fil
import ".."
Rectangle {
color: "#1b2939"
color: "#2a2e35"
width: 1200
height: 800
@@ -33,7 +33,7 @@ Rectangle {
}
background: Rectangle {
opacity: parent.down ? 1.0 : (parent.activeFocus ? 0.5 : 0.0)
color: "#406288"
color: "#2a2e35"
radius: 4
anchors.fill: parent
}
src/res/qml/common/MyText.qml
+1 -1
View File
@@ -3,6 +3,6 @@ import QtQuick.Controls 2.0
Text {
color: "#ffffff"
color: "#d9dbe0"
font.pointSize: 20
}
src/res/qml/common/MyTextField.qml
+3 -3
View File
@@ -6,14 +6,14 @@ TextField {
property int keyBoardUID: 0
property string savedText: ""
id: myTextField
color: "#cccccc"
color: "#d9dbe0"
text: ""
font.pointSize: 20
background: Button {
hoverEnabled: true
background: Rectangle {
color: parent.hovered ? "#2c435d" : "#1b2939"
border.color: "#cccccc"
color: parent.hovered ? "#484f5b" : "#2a2e35"
border.color: "#d9dbe0"
border.width: 2
}
onClicked: {
src/res/qml/common/MyToggleButton.qml
+3 -3
View File
@@ -15,7 +15,7 @@ CheckBox {
implicitHeight: 28
x: parent.leftPadding
y: parent.height / 2 - height / 2
color: parent.enabled ? (parent.down ? "#e0e0e0" : "#ffffff") : "#a0a0a0"
color: parent.enabled ? (parent.down ? "#181a1e" : "#3d4450") : "#181a1e"
border.width: 0
Path {
startX: 0
@@ -43,11 +43,11 @@ CheckBox {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
leftPadding: parent.indicator.width + parent.spacing
color: parent.enabled ? "#ffffff" : "#909090"
color: parent.enabled ? "#d9dbe0" : "#65676b"
}
background: Rectangle {
color: "#2c435d"
color: "#2a2e35"
opacity: parent.activeFocus ? 1.0 : 0
}
src/res/qml/common/mainwidget.qml
+1 -1
View File
@@ -14,7 +14,7 @@ import "../steamvr_page/steamvr_additional"
Rectangle {
id: root
color: "#1b2939"
color: "#2a2e35"
width: 1200
height: 800