Skip to content
Snippets Groups Projects
Commit b47d7f0e authored by Edric Milaret's avatar Edric Milaret
Browse files

settings: merge audio and video panel

Change-Id: I3efebfafeeefff31dd12d2c1948de4f4e2ec0b6d
Tuleap: #422
parent 032c000f
No related branches found
No related tags found
No related merge requests found
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Audio</string> <string>Audio/Video</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2"> <item row="0" column="2">
...@@ -564,28 +564,11 @@ ...@@ -564,28 +564,11 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="3">
</widget> <widget class="QTableView" name="videoCodecView"/>
<widget class="QWidget" name="video_codec_tab">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<attribute name="title">
<string>Video</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QCheckBox" name="lrcfg_isVideoEnabled">
<property name="text">
<string>Enable Video</string>
</property>
</widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="4">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_14">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
...@@ -624,7 +607,7 @@ ...@@ -624,7 +607,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
...@@ -641,16 +624,6 @@ ...@@ -641,16 +624,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<widget class="QTableView" name="videoCodecView">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="advancedTab"> <widget class="QWidget" name="advancedTab">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>558</width> <width>558</width>
<height>475</height> <height>516</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="generalTab"> <widget class="QWidget" name="generalTab">
<attribute name="title"> <attribute name="title">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment