Commit f4362a24 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: Simple preferences simplifications

parent b1ed8408
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>661</width> <width>703</width>
<height>670</height> <height>656</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -253,48 +253,7 @@ ...@@ -253,48 +253,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="3" column="0">
<widget class="QLabel" name="dolbyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Dolby Surround:</string>
</property>
<property name="buddy">
<cstring>detectionDolby</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="detectionDolby">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="volNormBox"> <widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -319,7 +278,7 @@ ...@@ -319,7 +278,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QDoubleSpinBox" name="volNormSpin"> <widget class="QDoubleSpinBox" name="volNormSpin">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
...@@ -329,7 +288,7 @@ ...@@ -329,7 +288,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="3" column="2">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -342,8 +301,8 @@ ...@@ -342,8 +301,8 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="0"> <item row="7" column="0">
<widget class="QLabel" name="replayLabel"> <widget class="QLabel" name="visuLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
...@@ -351,15 +310,15 @@ ...@@ -351,15 +310,15 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>Replay gain mode:</string> <string>Visualization:</string>
</property> </property>
<property name="alignment"> <property name="buddy">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <cstring>visualisation</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2"> <item row="7" column="2">
<widget class="QComboBox" name="replayCombo"> <widget class="QComboBox" name="visualisation">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
...@@ -368,49 +327,90 @@ ...@@ -368,49 +327,90 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="0" column="0">
<widget class="QLabel" name="visuLabel"> <widget class="QCheckBox" name="autoscaleBox">
<property name="text">
<string>Enable Time-Stretching audio</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="dolbyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Visualization:</string> <string>Dolby Surround:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>visualisation</cstring> <cstring>detectionDolby</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="2"> <item row="5" column="2">
<widget class="QComboBox" name="visualisation"> <widget class="QComboBox" name="detectionDolby">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex">
<number>-1</number>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="headphoneEffect"> <widget class="QLabel" name="replayLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Replay gain mode:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="replayCombo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text">
<string>Headphone surround effect</string>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0">
<widget class="QCheckBox" name="autoscaleBox"> <widget class="QCheckBox" name="headphoneEffect">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Enable Time-Stretching audio</string> <string>Headphone surround effect</string>
</property> </property>
</widget> </widget>
</item> </item>
......
...@@ -60,23 +60,7 @@ ...@@ -60,23 +60,7 @@
<string>Codecs</string> <string>Codecs</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="8" column="0"> <item row="8" column="2">
<widget class="QLabel" name="filterLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Skip H.264 in-loop deblocking filter</string>
</property>
<property name="buddy">
<cstring>loopFilterBox</cstring>
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<widget class="QComboBox" name="loopFilterBox"/> <widget class="QComboBox" name="loopFilterBox"/>
</item> </item>
<item row="14" column="0"> <item row="14" column="0">
...@@ -157,6 +141,49 @@ ...@@ -157,6 +141,49 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="0" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLineEdit" name="levelBox"/>
</item>
<item row="14" column="1">
<widget class="QComboBox" name="profileBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="filterLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Skip H.264 in-loop deblocking filter</string>
</property>
<property name="buddy">
<cstring>loopFilterBox</cstring>
</property>
</widget>
</item>
<item row="11" column="0" colspan="3">
<widget class="QCheckBox" name="systemCodecBox">
<property name="text">
<string>Use systems codecs if available, for WMV codecs</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="PostProcLevel"> <widget class="QSpinBox" name="PostProcLevel">
<property name="maximumSize"> <property name="maximumSize">
...@@ -179,33 +206,6 @@ ...@@ -179,33 +206,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="systemCodecBox">
<property name="text">
<string>Use system codecs if available (better quality, but dangerous)</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLineEdit" name="levelBox"/>
</item>
<item row="14" column="1">
<widget class="QComboBox" name="profileBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -215,16 +215,6 @@ ...@@ -215,16 +215,6 @@
<string>Files</string> <string>Files</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="aviLabel">
<property name="text">
<string>Damaged or incomplete AVI file</string>
</property>
<property name="buddy">
<cstring>AviRepair</cstring>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="recordLabel"> <widget class="QLabel" name="recordLabel">
<property name="minimumSize"> <property name="minimumSize">
...@@ -252,9 +242,26 @@ ...@@ -252,9 +242,26 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="3" column="0">
<widget class="QLabel" name="aviLabel">
<property name="text">
<string>Damaged or incomplete AVI file</string>
</property>
<property name="buddy">
<cstring>AviRepair</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="AviRepair"/> <widget class="QComboBox" name="AviRepair"/>
</item> </item>
<item row="2" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -264,26 +271,7 @@ ...@@ -264,26 +271,7 @@
<string>Network</string> <string>Network</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="2" column="0">
<widget class="QLabel" name="portLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Default port (server mode)</string>
</property>
<property name="margin">
<number>0</number>
</property>
<property name="buddy">
<cstring>UDPPort</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="httpProxyLabel"> <widget class="QLabel" name="httpProxyLabel">
<property name="text"> <property name="text">
<string>HTTP proxy URL</string> <string>HTTP proxy URL</string>
...@@ -293,23 +281,10 @@ ...@@ -293,23 +281,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="proxy"/> <widget class="QLineEdit" name="proxy"/>
</item> </item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default caching policy</string>
</property>
<property name="buddy">
<cstring>cachingCombo</cstring>
</property>
</widget>
</item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QComboBox" name="cachingCombo"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QRadioButton" name="live555TransportHTTPRadio"> <widget class="QRadioButton" name="live555TransportHTTPRadio">
...@@ -333,15 +308,60 @@ ...@@ -333,15 +308,60 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="live555TransportLabel"> <widget class="QLabel" name="live555TransportLabel">
<property name="text"> <property name="text">
<string>Live555 stream transport</string> <string>Live555 stream transport</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Default caching policy</string>
</property>
<property name="buddy">
<cstring>cachingCombo</cstring>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="cachingCombo"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="portLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Default port (server mode)</string>
</property>
<property name="margin">
<number>0</number>
</property>
<property name="buddy">
<cstring>UDPPort</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QSpinBox" name="UDPPort"> <widget class="QSpinBox" name="UDPPort">
<property name="alignment"> <property name="alignment">
...@@ -358,19 +378,6 @@ ...@@ -358,19 +378,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
...@@ -381,14 +388,11 @@ ...@@ -381,14 +388,11 @@
<tabstops> <tabstops>
<tabstop>DVDDevice</tabstop> <tabstop>DVDDevice</tabstop>
<tabstop>DVDBrowse</tabstop> <tabstop>DVDBrowse</tabstop>
<tabstop>AviRepair</tabstop>
<tabstop>recordPath</tabstop> <tabstop>recordPath</tabstop>
<tabstop>recordBrowse</tabstop> <tabstop>recordBrowse</tabstop>
<tabstop>UDPPort</tabstop>
<tabstop>proxy</tabstop> <tabstop>proxy</tabstop>
<tabstop>live555TransportHTTPRadio</tabstop> <tabstop>live555TransportHTTPRadio</tabstop>
<tabstop>live555TransportRTSP_TCPRadio</tabstop> <tabstop>live555TransportRTSP_TCPRadio</tabstop>
<tabstop>cachingCombo</tabstop>
<tabstop>hwAccelBox</tabstop> <tabstop>hwAccelBox</tabstop>