Skip to content

V
vlc-gpu
Commit 3b250298 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt sprefs, cleaning of Audio and Interface parts

parent 25300468
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 138 deletions
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 3b250298
...@@ -253,55 +253,7 @@ ...@@ -253,55 +253,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="0"> <item row="8" column="0">
<widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<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>Normalize volume to:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="volNormSpin">
<property name="enabled">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
</widget>
</item>
<item row="3" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>268</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="7" column="0">
<widget class="QLabel" name="visuLabel"> <widget class="QLabel" name="visuLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -317,7 +269,7 @@ ...@@ -317,7 +269,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2"> <item row="8" column="2" colspan="2">
<widget class="QComboBox" name="visualisation"> <widget class="QComboBox" name="visualisation">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -334,7 +286,7 @@ ...@@ -334,7 +286,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QLabel" name="dolbyLabel"> <widget class="QLabel" name="dolbyLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
...@@ -362,20 +314,7 @@ ...@@ -362,20 +314,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="2"> <item row="5" column="0">
<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="4" column="0">
<widget class="QLabel" name="replayLabel"> <widget class="QLabel" name="replayLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -391,7 +330,7 @@ ...@@ -391,7 +330,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="5" column="3">
<widget class="QComboBox" name="replayCombo"> <widget class="QComboBox" name="replayCombo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -401,7 +340,7 @@ ...@@ -401,7 +340,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="3">
<widget class="QCheckBox" name="headphoneEffect"> <widget class="QCheckBox" name="headphoneEffect">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
...@@ -414,6 +353,74 @@ ...@@ -414,6 +353,74 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" 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="4" column="0">
<widget class="QCheckBox" name="volNormBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<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>Normalize volume to:</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QDoubleSpinBox" name="volNormSpin">
<property name="enabled">
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
</widget>
</item>
<item row="4" column="3">
<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="7" column="2" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ 3b250298
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="2"> <item row="0" column="3" colspan="2">
<widget class="QComboBox" name="artFetcher"/> <widget class="QComboBox" name="artFetcher"/>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="2">
<widget class="QLabel" name="filterLabel"> <widget class="QLabel" name="filterLabel">
<property name="text"> <property name="text">
<string>Filter:</string> <string>Filter:</string>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="2"> <item row="3" column="3" colspan="2">
<widget class="QLineEdit" name="recentlyPlayedFilters"> <widget class="QLineEdit" name="recentlyPlayedFilters">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
...@@ -132,63 +132,63 @@ ...@@ -132,63 +132,63 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="4"> <item row="2" column="0" colspan="5">
<widget class="QWidget" name="updateNotifierZone" native="true"> <widget class="QWidget" name="updateNotifierZone" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QCheckBox" name="updatesBox">
<property name="minimumSize">
<size>
<width>220</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Activate updates notifier</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>27</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QSpinBox" name="updatesDays">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string> days</string>
</property>
<property name="prefix">
<string>Every </string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QCheckBox" name="updatesBox">
<property name="minimumSize">
<size>
<width>220</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Activate updates notifier</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QSpinBox" name="updatesDays">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string> days</string>
</property>
<property name="prefix">
<string>Every </string>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -283,27 +283,14 @@ ...@@ -283,27 +283,14 @@
<string>Look and feel</string> <string>Look and feel</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="4">
<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"> <widget class="QRadioButton" name="skins">
<property name="text"> <property name="text">
<string>Use custom skin</string> <string>Use custom skin</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="6">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -316,7 +303,7 @@ ...@@ -316,7 +303,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="2" column="0" rowspan="6" colspan="3"> <item row="2" column="0" rowspan="6" colspan="7">
<widget class="QStackedWidget" name="styleStackedWidget"> <widget class="QStackedWidget" name="styleStackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
...@@ -574,6 +561,52 @@ ...@@ -574,6 +561,52 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<spacer name="horizontalSpacer_4">
<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="0" column="2">
<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="3">
<spacer name="horizontalSpacer_5">
<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="1" column="2" colspan="3">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -588,7 +621,6 @@ ...@@ -588,7 +621,6 @@
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>language</tabstop> <tabstop>language</tabstop>
<tabstop>qt4</tabstop>
<tabstop>skins</tabstop> <tabstop>skins</tabstop>
<tabstop>fsController</tabstop> <tabstop>fsController</tabstop>
<tabstop>minimalviewBox</tabstop> <tabstop>minimalviewBox</tabstop>
...@@ -600,8 +632,6 @@ ...@@ -600,8 +632,6 @@
<tabstop>OneInterfaceMode</tabstop> <tabstop>OneInterfaceMode</tabstop>
<tabstop>EnqueueOneInterfaceMode</tabstop> <tabstop>EnqueueOneInterfaceMode</tabstop>
<tabstop>artFetcher</tabstop> <tabstop>artFetcher</tabstop>
<tabstop>updatesBox</tabstop>
<tabstop>updatesDays</tabstop>
<tabstop>saveRecentlyPlayed</tabstop> <tabstop>saveRecentlyPlayed</tabstop>
<tabstop>recentlyPlayedFilters</tabstop> <tabstop>recentlyPlayedFilters</tabstop>
<tabstop>treePlaylist</tabstop> <tabstop>treePlaylist</tabstop>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment