1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr2809'

This commit is contained in:
tux3 2016-01-17 13:24:56 +01:00
commit 0ea0918ce9
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -48,7 +48,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QCheckBox" name="filterAudio"> <widget class="QCheckBox" name="filterAudio">
<property name="toolTip"> <property name="toolTip">
<string>Filter sound from your microphone, so that people hearing you would get better sound.</string> <string>Filter sound from your microphone, so that people hearing you would get better sound.</string>
@ -109,6 +109,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2">
<widget class="QComboBox" name="inDevCombobox"/>
</item>
<item row="5" column="2"> <item row="5" column="2">
<widget class="QSlider" name="microphoneSlider"> <widget class="QSlider" name="microphoneSlider">
<property name="toolTip"> <property name="toolTip">
@ -129,9 +132,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2">
<widget class="QComboBox" name="inDevCombobox"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="outDevLabel"> <widget class="QLabel" name="outDevLabel">
<property name="text"> <property name="text">
@ -139,9 +139,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2">
<widget class="MicFeedbackWidget" name="microphoneFeedback" native="true"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -236,12 +233,6 @@ which may lead to problems with video calls.</string>
<header>src/widget/form/settings/verticalonlyscroller.h</header> <header>src/widget/form/settings/verticalonlyscroller.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>MicFeedbackWidget</class>
<extends>QWidget</extends>
<header>src/widget/tool/micfeedbackwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections/> <connections/>