From dac3e5baf4a97fd06e883afa5c51022c4ea7b475 Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Wed, 19 May 2021 12:51:39 +0200 Subject: [PATCH] CHANGE(client, ui): Display unit as suffix in SpinBox The units of the settings for positional audio were displayed behind the SpinBox as an additional label. This commit removes the labels and instead uses the "suffix" field of the SpinBoxes to display the unit directly in the SpinBox itself. In principal this also has the potential to fix the issue of the unit being placed incorrectly when an right-to-left locale is being used as in that case Qt should put the suffix on the other side. Note that this has not been verified though. --- src/mumble/AudioOutput.ui | 176 +++++++++++++++----------------------- 1 file changed, 69 insertions(+), 107 deletions(-) diff --git a/src/mumble/AudioOutput.ui b/src/mumble/AudioOutput.ui index 60cae290a..4f125a26e 100644 --- a/src/mumble/AudioOutput.ui +++ b/src/mumble/AudioOutput.ui @@ -7,7 +7,7 @@ 0 0 546 - 775 + 813 @@ -431,6 +431,48 @@ Positional Audio + + + + The connected "speakers" are actually headphones + + + Checking this indicates that you don't have speakers connected, just headphones. This is important, as speakers are usually in front of you, while headphones are directly to your left/right. + + + Headphones + + + + + + + + + + What should the volume be at the maximum distance? + + + Qt::Horizontal + + + + + + + + + + + + + This sets the minimum distance for sound calculations. The volume of other users' speech will not decrease until they are at least this far away from you. + + + Qt::Horizontal + + + @@ -451,75 +493,10 @@ - - - - The connected "speakers" are actually headphones - - - Checking this indicates that you don't have speakers connected, just headphones. This is important, as speakers are usually in front of you, while headphones are directly to your left/right. - - - Headphones - - - - - - - - 0 - 0 - - - - % - - - - - - - - - 1 - - - - - - - - - - What should the volume be at the maximum distance? - - - Qt::Horizontal - - - - - - - Minimum Volume - - - qsMaxDistance - - - - - - - - 0 - 0 - - - - m + + + % @@ -533,16 +510,10 @@ - - - - - 0 - 0 - - - - % + + + + % @@ -569,26 +540,23 @@ - - - - + + + + m - - - - - This sets the minimum distance for sound calculations. The volume of other users' speech will not decrease until they are at least this far away from you. - - - Qt::Horizontal + + 1 - - - - 1 + + + + Minimum Volume + + + qsMaxDistance @@ -602,22 +570,16 @@ - - - - - 0 - 0 - + + + + m - - m + + 1 - - -