Remove deprecated elements from AudioPage
There are still many elements remaining from the old input system. These have not been removed due to time constraints. They should be removed as part of a general clean up process. The PTT profile buttons have been replaced with a text telling users to use the SteamVR bindings interface. This is for people who don't read changelogs.
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 67 KiB |
@@ -10,18 +10,10 @@ ColumnLayout {
|
|||||||
id: audioMessageDialog
|
id: audioMessageDialog
|
||||||
}
|
}
|
||||||
|
|
||||||
PttDeleteProfileDialog {
|
|
||||||
id: pttDeleteProfileDialog
|
|
||||||
}
|
|
||||||
|
|
||||||
AudioDeleteProfileDialog {
|
AudioDeleteProfileDialog {
|
||||||
id: audioDeleteProfileDialog
|
id: audioDeleteProfileDialog
|
||||||
}
|
}
|
||||||
|
|
||||||
PttNewProfileDialog {
|
|
||||||
id: pttNewProfileDialog
|
|
||||||
}
|
|
||||||
|
|
||||||
AudioNewProfileDialog {
|
AudioNewProfileDialog {
|
||||||
id: audioNewProfileDialog
|
id: audioNewProfileDialog
|
||||||
}
|
}
|
||||||
@@ -61,38 +53,9 @@ ColumnLayout {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MyText {
|
MyText {
|
||||||
text: "PTT Profile:"
|
// Text continues in next RowLayout.
|
||||||
Layout.preferredWidth: 150
|
text: "Change the Push To Talk settings"
|
||||||
}
|
|
||||||
|
|
||||||
MyComboBox {
|
|
||||||
id: pttProfileComboBox
|
|
||||||
Layout.preferredWidth: 250
|
|
||||||
model: [""]
|
|
||||||
onCurrentIndexChanged: {
|
|
||||||
if (currentIndex > 0) {
|
|
||||||
pttApplyProfileButton.enabled = true
|
|
||||||
pttDeleteProfileButton.enabled = true
|
|
||||||
} else {
|
|
||||||
pttApplyProfileButton.enabled = false
|
|
||||||
pttDeleteProfileButton.enabled = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MyPushButton {
|
|
||||||
id: pttApplyProfileButton
|
|
||||||
enabled: true
|
|
||||||
Layout.preferredWidth: 150
|
|
||||||
text: "Apply"
|
|
||||||
onClicked: {
|
|
||||||
if (pttProfileComboBox.currentIndex > 0) {
|
|
||||||
AudioTabController.applyPttProfile(
|
|
||||||
pttProfileComboBox.currentIndex - 1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RowLayout {
|
RowLayout {
|
||||||
@@ -117,62 +80,27 @@ ColumnLayout {
|
|||||||
audioNewProfileDialog.openPopup()
|
audioNewProfileDialog.openPopup()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Item {
|
MyText {
|
||||||
Layout.fillWidth: true
|
// Text continues from RowLayout above.
|
||||||
}
|
text: "\t\tin the SteamVR bindings menu."
|
||||||
MyPushButton {
|
|
||||||
id: pttDeleteProfileButton
|
|
||||||
enabled: true
|
|
||||||
Layout.preferredWidth: 200
|
|
||||||
text: "Delete Profile"
|
|
||||||
onClicked: {
|
|
||||||
if (pttProfileComboBox.currentIndex > 0) {
|
|
||||||
pttDeleteProfileDialog.profileIndex = pttProfileComboBox.currentIndex - 1
|
|
||||||
pttDeleteProfileDialog.open()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MyPushButton {
|
|
||||||
Layout.preferredWidth: 200
|
|
||||||
text: "New Profile"
|
|
||||||
onClicked: {
|
|
||||||
pttNewProfileDialog.openPopup()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
reloadPttProfiles()
|
|
||||||
reloadAudioProfiles()
|
reloadAudioProfiles()
|
||||||
}
|
}
|
||||||
Connections {
|
Connections {
|
||||||
target: AudioTabController
|
target: AudioTabController
|
||||||
onPttProfilesUpdated: {
|
|
||||||
reloadPttProfiles()
|
|
||||||
}
|
|
||||||
onAudioProfilesUpdated: {
|
onAudioProfilesUpdated: {
|
||||||
reloadAudioProfiles()
|
reloadAudioProfiles()
|
||||||
}
|
}
|
||||||
onAudioProfileAdded: {
|
onAudioProfileAdded: {
|
||||||
audioProfileComboBox.currentIndex = AudioTabController.getAudioProfileCount()
|
audioProfileComboBox.currentIndex = AudioTabController.getAudioProfileCount()
|
||||||
}
|
}
|
||||||
onPttProfileAdded: {
|
|
||||||
pttProfileComboBox.currentIndex = AudioTabController.getPttProfileCount()
|
|
||||||
}
|
|
||||||
onDefaultProfileDisplay: {
|
onDefaultProfileDisplay: {
|
||||||
audioProfileComboBox.currentIndex = AudioTabController.getDefaultAudioProfileIndex(
|
audioProfileComboBox.currentIndex = AudioTabController.getDefaultAudioProfileIndex(
|
||||||
) + 1
|
) + 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function reloadPttProfiles() {
|
|
||||||
var profiles = [""]
|
|
||||||
var profileCount = AudioTabController.getPttProfileCount()
|
|
||||||
for (var i = 0; i < profileCount; i++) {
|
|
||||||
profiles.push(AudioTabController.getPttProfileName(i))
|
|
||||||
}
|
|
||||||
pttProfileComboBox.currentIndex = 0
|
|
||||||
pttProfileComboBox.model = profiles
|
|
||||||
}
|
|
||||||
|
|
||||||
function reloadAudioProfiles() {
|
function reloadAudioProfiles() {
|
||||||
var profiles = [""]
|
var profiles = [""]
|
||||||
var profileCount = AudioTabController.getAudioProfileCount()
|
var profileCount = AudioTabController.getAudioProfileCount()
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import "../../common"
|
|||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
Layout.fillWidth: true
|
||||||
PttControllerConfigDialog {
|
PttControllerConfigDialog {
|
||||||
id: pttControllerConfigDialog
|
id: pttControllerConfigDialog
|
||||||
pttControllerConfigClass: AudioTabController
|
pttControllerConfigClass: AudioTabController
|
||||||
@@ -13,47 +14,16 @@ ColumnLayout {
|
|||||||
|
|
||||||
MyToggleButton {
|
MyToggleButton {
|
||||||
id: audioPttEnabledToggle
|
id: audioPttEnabledToggle
|
||||||
Layout.preferredWidth: 260
|
//Layout.preferredWidth: 260
|
||||||
|
Layout.fillWidth: true
|
||||||
text: "Push-to-Talk:"
|
text: "Push-to-Talk:"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
AudioTabController.pttEnabled = checked
|
AudioTabController.pttEnabled = checked
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
MyToggleButton {
|
|
||||||
id: audioPttLeftControllerToggle
|
|
||||||
text: "Left Controller"
|
|
||||||
onClicked: {
|
|
||||||
AudioTabController.setPttLeftControllerEnabled(checked, false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MyPushButton {
|
|
||||||
text: "Configure"
|
|
||||||
onClicked: {
|
|
||||||
pttControllerConfigDialog.openPopup(0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Item {
|
|
||||||
Layout.fillWidth: true
|
|
||||||
}
|
|
||||||
MyToggleButton {
|
|
||||||
id: audioPttRightControllerToggle
|
|
||||||
text: "Right Controller"
|
|
||||||
onClicked: {
|
|
||||||
AudioTabController.setPttRightControllerEnabled(checked, false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
MyPushButton {
|
|
||||||
text: "Configure"
|
|
||||||
onClicked: {
|
|
||||||
pttControllerConfigDialog.openPopup(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RowLayout {
|
|
||||||
|
|
||||||
MyToggleButton {
|
MyToggleButton {
|
||||||
id: audioPttShowNotificationToggle
|
id: audioPttShowNotificationToggle
|
||||||
Layout.leftMargin: 350
|
Layout.fillWidth: true
|
||||||
text: "Show notification in HMD"
|
text: "Show notification in HMD"
|
||||||
onCheckedChanged: {
|
onCheckedChanged: {
|
||||||
AudioTabController.setPttShowNotification(checked, false)
|
AudioTabController.setPttShowNotification(checked, false)
|
||||||
@@ -61,7 +31,7 @@ ColumnLayout {
|
|||||||
}
|
}
|
||||||
MyToggleButton {
|
MyToggleButton {
|
||||||
id: audioPttReverseToggle
|
id: audioPttReverseToggle
|
||||||
Layout.leftMargin: 118
|
Layout.fillWidth: true
|
||||||
text: "Push-to-Mute"
|
text: "Push-to-Mute"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
AudioTabController.setMicReversePtt(checked, false)
|
AudioTabController.setMicReversePtt(checked, false)
|
||||||
@@ -71,8 +41,6 @@ ColumnLayout {
|
|||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
audioPttEnabledToggle.checked = AudioTabController.pttEnabled
|
audioPttEnabledToggle.checked = AudioTabController.pttEnabled
|
||||||
audioPttLeftControllerToggle.checked = AudioTabController.pttLeftControllerEnabled
|
|
||||||
audioPttRightControllerToggle.checked = AudioTabController.pttRightControllerEnabled
|
|
||||||
audioPttShowNotificationToggle.checked = AudioTabController.pttShowNotification
|
audioPttShowNotificationToggle.checked = AudioTabController.pttShowNotification
|
||||||
audioPttReverseToggle.checked = AudioTabController.micReversePtt
|
audioPttReverseToggle.checked = AudioTabController.micReversePtt
|
||||||
}
|
}
|
||||||
@@ -81,12 +49,6 @@ ColumnLayout {
|
|||||||
onPttEnabledChanged: {
|
onPttEnabledChanged: {
|
||||||
audioPttEnabledToggle.checked = AudioTabController.pttEnabled
|
audioPttEnabledToggle.checked = AudioTabController.pttEnabled
|
||||||
}
|
}
|
||||||
onPttLeftControllerEnabledChanged: {
|
|
||||||
audioPttLeftControllerToggle.checked = AudioTabController.pttLeftControllerEnabled
|
|
||||||
}
|
|
||||||
onPttRightControllerEnabledChanged: {
|
|
||||||
audioPttRightControllerToggle.checked = AudioTabController.pttRightControllerEnabled
|
|
||||||
}
|
|
||||||
onMicReversePttChanged: {
|
onMicReversePttChanged: {
|
||||||
audioPttReverseToggle.checked = AudioTabController.micReversePtt
|
audioPttReverseToggle.checked = AudioTabController.micReversePtt
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user