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

Qt: Simple preferences simplifications

parent b1ed8408
......@@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>661</width>
<height>670</height>
<width>703</width>
<height>656</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -253,48 +253,7 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" 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">
<item row="3" column="0">
<widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
......@@ -319,7 +278,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="volNormSpin">
<property name="enabled">
<bool>true</bool>
......@@ -329,7 +288,7 @@
</property>
</widget>
</item>
<item row="2" column="2">
<item row="3" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -342,8 +301,8 @@
</property>
</spacer>
</item>
<item row="3" column="0">
<widget class="QLabel" name="replayLabel">
<item row="7" column="0">
<widget class="QLabel" name="visuLabel">
<property name="minimumSize">
<size>
<width>250</width>
......@@ -351,15 +310,15 @@
</size>
</property>
<property name="text">
<string>Replay gain mode:</string>
<string>Visualization:</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="buddy">
<cstring>visualisation</cstring>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="replayCombo">
<item row="7" column="2">
<widget class="QComboBox" name="visualisation">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -368,49 +327,90 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="visuLabel">
<item row="0" column="0">
<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">
<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>Visualization:</string>
<string>Dolby Surround:</string>
</property>
<property name="buddy">
<cstring>visualisation</cstring>
<cstring>detectionDolby</cstring>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QComboBox" name="visualisation">
<item row="5" column="2">
<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="5" column="0">
<widget class="QCheckBox" name="headphoneEffect">
<item row="4" column="0">
<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">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Headphone surround effect</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="autoscaleBox">
<item row="6" column="0">
<widget class="QCheckBox" name="headphoneEffect">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Enable Time-Stretching audio</string>
<string>Headphone surround effect</string>
</property>
</widget>
</item>
......
......@@ -60,23 +60,7 @@
<string>Codecs</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<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="8" column="1" colspan="2">
<item row="8" column="2">
<widget class="QComboBox" name="loopFilterBox"/>
</item>
<item row="14" column="0">
......@@ -157,6 +141,49 @@
</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>
<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">
<widget class="QSpinBox" name="PostProcLevel">
<property name="maximumSize">
......@@ -179,33 +206,6 @@
</property>
</widget>
</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>
</widget>
</item>
......@@ -215,16 +215,6 @@
<string>Files</string>
</property>
<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">
<widget class="QLabel" name="recordLabel">
<property name="minimumSize">
......@@ -252,9 +242,26 @@
</item>
</layout>
</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"/>
</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>
</widget>
</item>
......@@ -264,26 +271,7 @@
<string>Network</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" 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">
<item row="2" column="0">
<widget class="QLabel" name="httpProxyLabel">
<property name="text">
<string>HTTP proxy URL</string>
......@@ -293,23 +281,10 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QLineEdit" name="proxy"/>
</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">
<widget class="QComboBox" name="cachingCombo"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="live555TransportHTTPRadio">
......@@ -333,15 +308,60 @@
</item>
</layout>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="live555TransportLabel">
<property name="text">
<string>Live555 stream transport</string>
</property>
</widget>
</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">
<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">
<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>
<widget class="QSpinBox" name="UDPPort">
<property name="alignment">
......@@ -358,19 +378,6 @@
</property>
</widget>
</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>
</item>
</layout>
......@@ -381,14 +388,11 @@
<tabstops>
<tabstop>DVDDevice</tabstop>
<tabstop>DVDBrowse</tabstop>
<tabstop>AviRepair</tabstop>
<tabstop>recordPath</tabstop>
<tabstop>recordBrowse</tabstop>
<tabstop>UDPPort</tabstop>
<tabstop>proxy</tabstop>
<tabstop>live555TransportHTTPRadio</tabstop>
<tabstop>live555TransportRTSP_TCPRadio</tabstop>
<tabstop>cachingCombo</tabstop>
<tabstop>hwAccelBox</tabstop>
<tabstop>loopFilterBox</tabstop>
</tabstops>
......
......@@ -7,8 +7,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>664</width>
<height>555</height>
<width>697</width>
<height>590</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -36,9 +36,6 @@
<string>Instances</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>9</number>
</property>
......@@ -48,6 +45,9 @@
<property name="bottomMargin">
<number>9</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="OneInterfaceMode">
<property name="text">
......@@ -147,7 +147,7 @@
</size>
</property>
<property name="text">
<string>Activate update notifier</string>
<string>Activate updates notifier</string>
</property>
</widget>
</item>
......@@ -283,6 +283,39 @@
<string>Look and feel</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QRadioButton" name="qt4">
<property name="toolTip">
<string>This is VLC's default interface, with a native look and feel.</string>
</property>
<property name="text">
<string>Use native style</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="skins">
<property name="text">
<string>Use custom skin</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<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 row="2" column="0" rowspan="6" colspan="3">
<widget class="QStackedWidget" name="styleStackedWidget">
<property name="currentIndex">
......@@ -541,39 +574,6 @@
</widget>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="qt4">
<property name="toolTip">
<string>This is VLC's default interface, with a native look and feel.</string>
</property>
<property name="text">
<string>Use native style</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QRadioButton" name="skins">
<property name="text">
<string>Use custom skin</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>