mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

CHANGE(client, ui): Display unit as suffix in SpinBox

Browse Source 
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.
This commit is contained in:
Robert Adam 2021-05-19 12:51:39 +02:00
parent 998eb37adb
commit dac3e5baf4
1 changed files with 69 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/mumble/AudioOutput.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>546</width>
<height>775</height>
<height>813</height>
</rect>
</property>
<property name="windowTitle">
@ -431,6 +431,48 @@
<string>Positional Audio</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2">
<widget class="QCheckBox" name="qcbHeadphones">
<property name="toolTip">
<string>The connected &quot;speakers&quot; are actually headphones</string>
</property>
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>Headphones</string>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QSlider" name="qsMinimumVolume">
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string>What should the volume be at the maximum distance?</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QSlider" name="qsMinDistance">
<property name="toolTip">
<string/>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string>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.</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QSlider" name="qsMaxDistance">
<property name="toolTip">
@ -451,75 +493,10 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="qcbHeadphones">
<property name="toolTip">
<string>The connected &quot;speakers&quot; are actually headphones</string>
</property>
<property name="whatsThis">
<string>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.</string>
</property>
<property name="text">
<string>Headphones</string>
</property>
</widget>
</item>
<item row="8" column="5">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item row="8" column="3">
<widget class="QSpinBox" name="qsbBloom"/>
</item>
<item row="3" column="3">
<widget class="QDoubleSpinBox" name="qsbMinimumDistance">
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QSlider" name="qsMinimumVolume">
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string>What should the volume be at the maximum distance?</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="qlMinimumVolume">
<property name="text">
<string>Minimum Volume</string>
</property>
<property name="buddy">
<cstring>qsMaxDistance</cstring>
</property>
</widget>
</item>
<item row="6" column="5">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>m</string>
<widget class="QSpinBox" name="qsbBloom">
<property name="suffix">
<string> %</string>
</property>
</widget>
</item>
@ -533,16 +510,10 @@
</property>
</widget>
</item>
<item row="7" column="5">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>%</string>
<item row="7" column="3">
<widget class="QSpinBox" name="qsbMinimumVolume">
<property name="suffix">
<string> %</string>
</property>
</widget>
</item>
@ -569,26 +540,23 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QSlider" name="qsMinDistance">
<property name="toolTip">
<string/>
<item row="6" column="3">
<widget class="QDoubleSpinBox" name="qsbMaximumDistance">
<property name="suffix">
<string> m</string>
</property>
<property name="statusTip">
<string/>
</property>
<property name="whatsThis">
<string>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.</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="6" column="3">
<widget class="QDoubleSpinBox" name="qsbMaximumDistance">
<property name="decimals">
<number>1</number>
<item row="7" column="1">
<widget class="QLabel" name="qlMinimumVolume">
<property name="text">
<string>Minimum Volume</string>
</property>
<property name="buddy">
<cstring>qsMaxDistance</cstring>
</property>
</widget>
</item>
@ -602,22 +570,16 @@
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="3" column="3">
<widget class="QDoubleSpinBox" name="qsbMinimumDistance">
<property name="suffix">
<string> m</string>
</property>
<property name="text">
<string>m</string>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="7" column="3">
<widget class="QSpinBox" name="qsbMinimumVolume"/>
</item>
</layout>
</widget>
</item>