Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixing audio screen with master

Browse source
This commit is contained in:
Wayne Chen 2019-03-26 10:26:29 -07:00
parent 7b56bef838
commit a2d754cebd
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -540,6 +540,8 @@ Rectangle {
x: margins.paddings; x: margins.paddings;
width: parent.width - margins.paddings*2 width: parent.width - margins.paddings*2
height: injectorGainSliderTextMetrics.height height: injectorGainSliderTextMetrics.height
anchors.top: avatarGainContainer.bottom;
anchors.topMargin: 10;
HifiControlsUit.Slider { HifiControlsUit.Slider {
id: injectorGainSlider id: injectorGainSlider
@ -599,6 +601,8 @@ Rectangle {
x: margins.paddings; x: margins.paddings;
width: parent.width - margins.paddings*2 width: parent.width - margins.paddings*2
height: systemInjectorGainSliderTextMetrics.height height: systemInjectorGainSliderTextMetrics.height
anchors.top: injectorGainContainer.bottom;
anchors.topMargin: 10;
HifiControlsUit.Slider { HifiControlsUit.Slider {
id: systemInjectorGainSlider id: systemInjectorGainSlider

19
interface/resources/qml/hifi/audio/LoopbackAudio.qml
View file

@ -44,8 +44,11 @@ RowLayout {
} }
HifiControlsUit.Button { HifiControlsUit.Button {
text: audioLoopedBack ? qsTr("STOP TESTING") : qsTr("TEST YOUR VOICE"); text: audioLoopedBack ? qsTr("STOP TESTING VOICE") : qsTr("TEST YOUR VOICE");
color: audioLoopedBack ? hifi.buttons.red : hifi.buttons.blue; color: audioLoopedBack ? hifi.buttons.red : hifi.buttons.blue;
fontSize: 15;
width: 200;
height: 32;
onClicked: { onClicked: {
if (audioLoopedBack) { if (audioLoopedBack) {
loopbackTimer.stop(); loopbackTimer.stop();
@ -57,11 +60,11 @@ RowLayout {
} }
} }
// RalewayRegular { RalewayRegular {
// Layout.leftMargin: 2; Layout.leftMargin: 2;
// size: 14; size: 14;
// color: "white"; color: "white";
// font.italic: true font.italic: true
// text: audioLoopedBack ? qsTr("Speak in your input") : ""; text: audioLoopedBack ? qsTr("Speak in your input") : "";
// } }
} }

17
interface/resources/qml/hifi/audio/PlaySampleSound.qml
View file

@ -59,13 +59,16 @@ RowLayout {
text: isPlaying ? qsTr("STOP TESTING") : qsTr("TEST YOUR SOUND"); text: isPlaying ? qsTr("STOP TESTING") : qsTr("TEST YOUR SOUND");
color: isPlaying ? hifi.buttons.red : hifi.buttons.blue; color: isPlaying ? hifi.buttons.red : hifi.buttons.blue;
onClicked: isPlaying ? stopSound() : playSound(); onClicked: isPlaying ? stopSound() : playSound();
fontSize: 15;
width: 200;
height: 32;
} }
// RalewayRegular { RalewayRegular {
// Layout.leftMargin: 2; Layout.leftMargin: 2;
// size: 14; size: 14;
// color: "white"; color: "white";
// font.italic: true font.italic: true
// text: isPlaying ? qsTr("Listen to your output") : ""; text: isPlaying ? qsTr("Listen to your output") : "";
// } }
} }