Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix blocks

Browse source
This commit is contained in:
motofckr9k 2020-07-03 10:22:06 +02:00
parent 878c6c68c8
commit bb91c1c89b
1 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -326,10 +326,10 @@ Rectangle {
size: 16; size: 16;
text: (bar.currentIndex === 0) ? qsTr("Press and hold the button \"T\" to talk.") : text: (bar.currentIndex === 0) ? qsTr("Press and hold the button \"T\" to talk.") :
qsTr("Press and hold triggers on both of your controllers to talk."); qsTr("Press and hold grip triggers on your controllers to talk.");
} }
} }
Item { Item {
id: avatarGainContainer id: avatarGainContainer
x: margins.paddings; x: margins.paddings;
@ -546,29 +546,28 @@ Rectangle {
color: hifi.colors.white; color: hifi.colors.white;
text: qsTr("Choose input device"); text: qsTr("Choose input device");
} }
} AudioControls.LoopbackAudio {
id: loopbackAudio
AudioControls.LoopbackAudio { x: margins.paddings
id: loopbackAudio anchors.top: inputDeviceHeader.bottom;
x: margins.paddings anchors.topMargin: 10;
anchors.top: inputDeviceHeader.bottom;
anchors.topMargin: 10;
visible: (bar.currentIndex === 1 && isVR) || visible: (bar.currentIndex === 1 && isVR) ||
(bar.currentIndex === 0 && !isVR); (bar.currentIndex === 0 && !isVR);
anchors { left: parent.left; leftMargin: margins.paddings } anchors { left: parent.left; leftMargin: margins.paddings }
}
AudioControls.InputPeak {
id: inputLevel
anchors.right: parent.right
peak: model.peak;
anchors.verticalCenter: parent.verticalCenter
visible: ((bar.currentIndex === 1 && isVR) ||
(bar.currentIndex === 0 && !isVR)) &&
AudioScriptingInterface.devices.input.peakValuesAvailable;
}
} }
AudioControls.InputPeak {
id: inputLevel
anchors.right: parent.right
peak: model.peak;
anchors.verticalCenter: parent.verticalCenter
visible: ((bar.currentIndex === 1 && isVR) ||
(bar.currentIndex === 0 && !isVR)) &&
AudioScriptingInterface.devices.input.peakValuesAvailable;
}
ListView { ListView {
id: inputView; id: inputView;
width: rightMostInputLevelPos; width: rightMostInputLevelPos;
@ -577,14 +576,14 @@ Rectangle {
x: margins.paddings x: margins.paddings
interactive: false; interactive: false;
height: contentHeight; height: contentHeight;
clip: true; clip: true;
model: AudioScriptingInterface.devices.input; model: AudioScriptingInterface.devices.input;
delegate: Item { delegate: Item {
width: rightMostInputLevelPos - margins.paddings*2 width: rightMostInputLevelPos - margins.paddings*2
height: ((type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)) ? height: ((type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)) ?
(margins.sizeCheckBox > checkBoxInput.implicitHeight ? margins.sizeCheckBox + 4 : checkBoxInput.implicitHeight + 4) : 0 (margins.sizeCheckBox > checkBoxInput.implicitHeight ? margins.sizeCheckBox + 4 : checkBoxInput.implicitHeight + 4) : 0
visible: (type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1) visible: (type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)
AudioControls.CheckBox { AudioControls.CheckBox {
id: checkBoxInput id: checkBoxInput
anchors.left: parent.left anchors.left: parent.left
@ -605,7 +604,7 @@ Rectangle {
AudioScriptingInterface.setInputDevice(info, bar.currentIndex === 1); AudioScriptingInterface.setInputDevice(info, bar.currentIndex === 1);
} }
} }
} }
} }
} }
@ -642,15 +641,15 @@ Rectangle {
color: hifi.colors.white; color: hifi.colors.white;
text: qsTr("Choose output device"); text: qsTr("Choose output device");
} }
AudioControls.PlaySampleSound {
id: playSampleSound
x: margins.paddings
anchors.top: outputDeviceHeader.bottom;
anchors.topMargin: 10;
}
} }
AudioControls.PlaySampleSound {
id: playSampleSound
x: margins.paddings
anchors.top: outputDeviceHeader.bottom;
anchors.topMargin: 10;
}
ListView { ListView {
id: outputView id: outputView
width: parent.width - margins.paddings*2 width: parent.width - margins.paddings*2
@ -663,9 +662,9 @@ Rectangle {
model: AudioScriptingInterface.devices.output; model: AudioScriptingInterface.devices.output;
delegate: Item { delegate: Item {
width: rightMostInputLevelPos width: rightMostInputLevelPos
height: ((type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)) ? height: ((type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)) ?
(margins.sizeCheckBox > checkBoxOutput.implicitHeight ? margins.sizeCheckBox + 4 : checkBoxOutput.implicitHeight + 4) : 0 (margins.sizeCheckBox > checkBoxOutput.implicitHeight ? margins.sizeCheckBox + 4 : checkBoxOutput.implicitHeight + 4) : 0
visible: (type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1) visible: (type != "hmd" && bar.currentIndex === 0) || (type != "desktop" && bar.currentIndex === 1)
AudioControls.CheckBox { AudioControls.CheckBox {
id: checkBoxOutput id: checkBoxOutput
@ -685,8 +684,8 @@ Rectangle {
} }
} }
} }
// Spacer item // Spacer item
Item { Item {
anchors.top: outputView.bottom; anchors.top: outputView.bottom;
anchors.topMargin: 10; anchors.topMargin: 10;