Skip to content

V
vlc-2-2
Commit 014b14a3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt4: One Day / One Simples Pref UI. 

The Input Ui needs to be reviewed since I added a few buttons that weren't specified in the wiki.
parent 2c975948
Show whitespace changes
Inline Side-by-side
Showing with 448 additions and 161 deletions
modules/gui/qt4/Modules.am
View file @ 014b14a3
...@@ -20,6 +20,7 @@ TOUI = \ ...@@ -20,6 +20,7 @@ TOUI = \
ui/open \ ui/open \
ui/main_interface \ ui/main_interface \
ui/sprefs_audio \ ui/sprefs_audio \
ui/sprefs_input \
ui/sprefs_interface \ ui/sprefs_interface \
ui/sprefs_playlist \ ui/sprefs_playlist \
ui/sprefs_subtitles \ ui/sprefs_subtitles \
...@@ -175,6 +176,7 @@ EXTRA_DIST += \ ...@@ -175,6 +176,7 @@ EXTRA_DIST += \
ui/open.ui \ ui/open.ui \
ui/main_interface.ui \ ui/main_interface.ui \
ui/sprefs_audio.ui \ ui/sprefs_audio.ui \
ui/sprefs_input.ui \
ui/sprefs_interface.ui \ ui/sprefs_interface.ui \
ui/sprefs_playlist.ui \ ui/sprefs_playlist.ui \
ui/sprefs_subtitles.ui \ ui/sprefs_subtitles.ui \
......
modules/gui/qt4/components/simple_preferences.cpp
View file @ 014b14a3
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "pixmaps/video_50x50.xpm" #include "pixmaps/video_50x50.xpm"
#include "ui/sprefs_audio.h" #include "ui/sprefs_audio.h"
#include "ui/sprefs_input.h"
#include "ui/sprefs_video.h" #include "ui/sprefs_video.h"
#include "ui/sprefs_subtitles.h" #include "ui/sprefs_subtitles.h"
#include "ui/sprefs_playlist.h" #include "ui/sprefs_playlist.h"
......
modules/gui/qt4/ui/sprefs_audio.ui
View file @ 014b14a3
<ui version="4.0" > <ui version="4.0" >
<author>Jean-Baptiste Kempf</author>
<class>SPrefsAudio</class> <class>SPrefsAudio</class>
<widget class="QWidget" name="SPrefsAudio" > <widget class="QWidget" name="SPrefsAudio" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>475</width> <width>418</width>
<height>597</height> <height>597</height>
</rect> </rect>
</property> </property>
...@@ -29,23 +30,46 @@ ...@@ -29,23 +30,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBox_3" > <widget class="QGroupBox" name="groupBox_3" >
<property name="title" > <property name="title" >
<string>General Audio</string> <string>General Audio</string>
</property> </property>
<widget class="QSlider" name="defaultVolume" > <layout class="QGridLayout" >
<property name="geometry" > <property name="margin" >
<rect> <number>9</number>
<x>250</x>
<y>60</y>
<width>200</width>
<height>16</height>
</rect>
</property> </property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Force detection of Dolby Surround</string>
</property>
</widget>
</item>
<item row="2" column="2" >
<widget class="QComboBox" name="preferredAudioLanguage_2" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>3</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
...@@ -53,49 +77,24 @@ ...@@ -53,49 +77,24 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>200</width> <width>300</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="orientation" > <property name="currentIndex" >
<enum>Qt::Horizontal</enum> <number>-1</number>
</property>
</widget>
<widget class="QLabel" name="label_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>50</y>
<width>249</width>
<height>17</height>
</rect>
</property>
<property name="text" >
<string>Default volume</string>
</property> </property>
</widget> </widget>
</item>
<item row="1" column="0" colspan="3" >
<widget class="QCheckBox" name="checkBox" > <widget class="QCheckBox" name="checkBox" >
<property name="geometry" >
<rect>
<x>10</x>
<y>90</y>
<width>231</width>
<height>23</height>
</rect>
</property>
<property name="text" > <property name="text" >
<string>Use S/PDIF when available</string> <string>Use S/PDIF when available</string>
</property> </property>
</widget> </widget>
</item>
<item row="3" column="2" >
<widget class="QComboBox" name="preferredAudioLanguage" > <widget class="QComboBox" name="preferredAudioLanguage" >
<property name="geometry" >
<rect>
<x>250</x>
<y>20</y>
<width>200</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>1</hsizetype>
...@@ -111,28 +110,16 @@ ...@@ -111,28 +110,16 @@
</size> </size>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_8" > </item>
<property name="geometry" > <item row="3" column="0" colspan="2" >
<rect> <widget class="QLabel" name="label" >
<x>10</x>
<y>120</y>
<width>249</width>
<height>26</height>
</rect>
</property>
<property name="text" > <property name="text" >
<string>Force detection of Dolby Surround</string> <string>Preferred audio language</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" name="preferredAudioLanguage_2" > </item>
<property name="geometry" > <item row="0" column="2" >
<rect> <widget class="QSlider" name="defaultVolume" >
<x>250</x>
<y>120</y>
<width>200</width>
<height>26</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>1</hsizetype> <hsizetype>1</hsizetype>
...@@ -143,27 +130,23 @@ ...@@ -143,27 +130,23 @@
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>300</width> <width>200</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="currentIndex" > <property name="orientation" >
<number>-1</number> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label" > </item>
<property name="geometry" > <item row="0" column="0" colspan="2" >
<rect> <widget class="QLabel" name="label_2" >
<x>10</x>
<y>20</y>
<width>249</width>
<height>26</height>
</rect>
</property>
<property name="text" > <property name="text" >
<string>Preferred audio language</string> <string>Default volume</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -178,49 +161,63 @@ ...@@ -178,49 +161,63 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="3" column="2" > <item row="4" column="1" >
<widget class="QPushButton" name="fileBrowseButton" > <widget class="QLineEdit" name="FileName" />
</item>
<item row="4" column="2" >
<widget class="QPushButton" name="fileBrowseButton_2" >
<property name="text" > <property name="text" >
<string>Browse</string> <string>Browse</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" > <item row="4" column="0" >
<widget class="QPushButton" name="fileBrowseButton_2" > <widget class="QLabel" name="label_7" >
<property name="text" > <property name="text" >
<string>Browse</string> <string>File</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" > <item row="3" column="2" >
<widget class="QLineEdit" name="lineEdit" /> <widget class="QPushButton" name="OSSBrowse" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="1" >
<widget class="QLineEdit" name="lineEdit_2" /> <widget class="QLineEdit" name="OSSDevice" />
</item>
<item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="alsaDevice_2" />
</item> </item>
<item row="1" column="1" colspan="2" > <item row="3" column="0" >
<widget class="QComboBox" name="alsaDevice" /> <widget class="QLabel" name="OSSLabel" >
</item> <property name="text" >
<item row="0" column="1" colspan="2" > <string>OSS Device</string>
<widget class="QComboBox" name="outputModule" /> </property>
</widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_6" > <widget class="QLabel" name="DirectXLabel" >
<property name="text" > <property name="text" >
<string>DirectX Device</string> <string>DirectX Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2" >
<widget class="QComboBox" name="DirectXDevice" />
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="alsaLabel" >
<property name="text" > <property name="text" >
<string>Alsa Device</string> <string>Alsa Device</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="alsaDevice" />
</item>
<item row="0" column="1" colspan="2" >
<widget class="QComboBox" name="outputModule" />
</item>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_3" > <widget class="QLabel" name="label_3" >
<property name="text" > <property name="text" >
...@@ -228,20 +225,6 @@ ...@@ -228,20 +225,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>OSS Device</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>File</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -299,6 +282,7 @@ p, li { white-space: pre-wrap; } ...@@ -299,6 +282,7 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<includes/>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
modules/gui/qt4/ui/sprefs_input.ui 0 → 100644
View file @ 014b14a3
<ui version="4.0" >
<author>Jean-Baptiste Kempf</author>
<class>Spref_input</class>
<widget class="QWidget" name="Spref_input" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>439</width>
<height>552</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>Disk Devices</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="2" >
<widget class="QPushButton" name="CDDevice" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QLineEdit" name="CDDevice" />
</item>
<item row="0" column="2" >
<widget class="QPushButton" name="DVDBrowse" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QPushButton" name="VCDBrowse" >
<property name="text" >
<string>Browse</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Audio CD Device</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>VCD Device</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="DVDDevice" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>DVD Device</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="VCDDevice" />
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Network</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>UDP Default Port</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="UDPPort" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>1234</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>Codecs / Muxers</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" >
<widget class="QCheckBox" name="RTCP_TCPBox" >
<property name="text" >
<string>Use RTP over RTCP (TCP)</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
<string>Repair AVI files</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QSpinBox" name="PostProcLevel" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" >
<number>65535</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>6</number>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QComboBox" name="AviRepair" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>Post-Processing Quality</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>Access Filter</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="timeshiftBox" >
<property name="text" >
<string>Timeshift</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="RecordBox" >
<property name="text" >
<string>Record</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="DumpBox" >
<property name="text" >
<string>Dump</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_5" >
<property name="title" >
<string>Caching</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QSpinBox" name="localCache" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" >
<number>10000</number>
</property>
<property name="value" >
<number>300</number>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QSpinBox" name="DiscCache" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" >
<number>10000</number>
</property>
<property name="value" >
<number>300</number>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QSpinBox" name="networkCache" >
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
<property name="maximum" >
<number>10000</number>
</property>
<property name="value" >
<number>300</number>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="" >
<property name="text" >
<string>Default Network caching in ms</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Default Disc caching in ms</string>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Default local caching in ms</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<includes/>
<resources/>
<connections/>
</ui>
modules/gui/qt4/ui/sprefs_video.ui
View file @ 014b14a3
<ui version="4.0" > <ui version="4.0" >
<author>Jean-Baptiste Kempf</author>
<class>SPrefsVideo</class> <class>SPrefsVideo</class>
<widget class="QWidget" name="SPrefsVideo" > <widget class="QWidget" name="SPrefsVideo" >
<property name="geometry" > <property name="geometry" >
...@@ -217,6 +218,7 @@ ...@@ -217,6 +218,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<includes/>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>
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