Skip to content

V
vlc-1.1
Commit cbc27099 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf
Browse files
Options

Qt: Simple prefs Input/codec ui fixes 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 677a311c
Show whitespace changes
Inline Side-by-side
Showing with 188 additions and 89 deletions
modules/demux/avi/avi.c
View file @ cbc27099
...@@ -57,7 +57,8 @@ static void Close( vlc_object_t * ); ...@@ -57,7 +57,8 @@ static void Close( vlc_object_t * );
static const int pi_index[] = {0,1,2}; static const int pi_index[] = {0,1,2};
static const char *const ppsz_indexes[] = { N_("Ask"), N_("Always fix"), static const char *const ppsz_indexes[] = { N_("Ask for action"),
N_("Always fix"),
N_("Never fix") }; N_("Never fix") };
vlc_module_begin () vlc_module_begin ()
......
modules/gui/qt4/components/simple_preferences.cpp
View file @ cbc27099
...@@ -417,6 +417,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -417,6 +417,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
#else #else
ui.systemCodecBox->hide(); ui.systemCodecBox->hide();
ui.systemCodecLabel->hide();
#endif #endif
optionWidgets.append( ui.DVDDevice ); optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo ); optionWidgets.append( ui.cachingCombo );
......
modules/gui/qt4/ui/sprefs_input.ui
View file @ cbc27099
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>687</width> <width>687</width>
<height>507</height> <height>489</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -18,13 +18,19 @@ ...@@ -18,13 +18,19 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Disc Devices</string> <string>Optical drive</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Default disc device</string> <string>Default optical device</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>DVDDevice</cstring> <cstring>DVDDevice</cstring>
...@@ -32,26 +38,57 @@ ...@@ -32,26 +38,57 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLineEdit" name="DVDDevice"/> <widget class="QLineEdit" name="DVDDevice"/>
</item> </item>
<item row="0" column="2"> <item>
<widget class="QPushButton" name="DVDBrowse"> <widget class="QPushButton" name="DVDBrowse">
<property name="text"> <property name="text">
<string>Browse...</string> <string>Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<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"> <item row="1" column="0">
<widget class="QLabel" name="recordLabel"> <widget class="QLabel" name="recordLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Record directory or filename</string> <string>Record directory or filename</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLineEdit" name="recordPath"/> <widget class="QLineEdit" name="recordPath"/>
</item> </item>
<item row="1" column="2"> <item>
<widget class="QPushButton" name="recordBrowse"> <widget class="QPushButton" name="recordBrowse">
<property name="text"> <property name="text">
<string>Browse...</string> <string>Browse...</string>
...@@ -59,6 +96,11 @@ ...@@ -59,6 +96,11 @@
</widget> </widget>
</item> </item>
</layout> </layout>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="AviRepair"/>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
...@@ -69,8 +111,14 @@ ...@@ -69,8 +111,14 @@
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="portLabel"> <widget class="QLabel" name="portLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Server default port</string> <string>Default port (server mode)</string>
</property> </property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
...@@ -80,26 +128,10 @@ ...@@ -80,26 +128,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QSpinBox" name="UDPPort">
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>1234</number>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="httpProxyLabel"> <widget class="QLabel" name="httpProxyLabel">
<property name="text"> <property name="text">
<string>HTTP proxy</string> <string>HTTP proxy URL</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>proxy</cstring> <cstring>proxy</cstring>
...@@ -109,27 +141,82 @@ ...@@ -109,27 +141,82 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="proxy"/> <widget class="QLineEdit" name="proxy"/>
</item> </item>
</layout> <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> </widget>
</item> </item>
<item row="3" column="1">
<widget class="QComboBox" name="cachingCombo"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox_5"> <widget class="QRadioButton" name="HTTP">
<property name="title"> <property name="text">
<string>Caching</string> <string>HTTP (default)</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <property name="checkable">
<item row="0" column="0"> <bool>true</bool>
<widget class="QLabel" name="label_2"> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="RTSP_TCPBox">
<property name="text"> <property name="text">
<string>Default caching level</string> <string>RTP over RTSP (TCP)</string>
</property> </property>
<property name="buddy"> </widget>
<cstring>cachingCombo</cstring> </item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Stream transport</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="cachingCombo"/> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QSpinBox" name="UDPPort">
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
<property name="value">
<number>1234</number>
</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> </item>
</layout> </layout>
</widget> </widget>
...@@ -137,20 +224,41 @@ ...@@ -137,20 +224,41 @@
<item> <item>
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>Codecs / Muxers</string> <string>Codecs</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="2" column="0">
<widget class="QLabel" name="ppLabel"> <widget class="QLabel" name="ppLabel">
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Post-Processing quality</string> <string>Video quality post-processing level</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>PostProcLevel</cstring> <cstring>PostProcLevel</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="7" column="0">
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>H.264 in-loop deblocking filter</string>
</property>
<property name="buddy">
<cstring>loopFilterBox</cstring>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QComboBox" name="loopFilterBox"/>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QSpinBox" name="PostProcLevel"> <widget class="QSpinBox" name="PostProcLevel">
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight</set> <set>Qt::AlignRight</set>
...@@ -159,53 +267,42 @@ ...@@ -159,53 +267,42 @@
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>65535</number> <number>26</number>
</property> </property>
<property name="value"> <property name="value">
<number>6</number> <number>6</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="aviLabel"> <spacer name="horizontalSpacer">
<property name="text"> <property name="orientation">
<string>Repair AVI files</string> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="buddy"> <property name="sizeHint" stdset="0">
<cstring>AviRepair</cstring> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="1" column="1"> </layout>
<widget class="QComboBox" name="AviRepair"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="systemCodecBox">
<property name="text">
<string>Use system codecs if available (better quality)</string>
</property>
</widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="1" column="0">
<widget class="QCheckBox" name="RTSP_TCPBox"> <widget class="QLabel" name="systemCodecLabel">
<property name="text"> <property name="text">
<string>Use RTP over RTSP (TCP)</string> <string>System codecs (better quality)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="1" column="1">
<widget class="QLabel" name="filterLabel"> <widget class="QCheckBox" name="systemCodecBox">
<property name="text"> <property name="text">
<string>Skip the loop filter for H.264 decoding</string> <string>Use host codecs if available</string>
</property>
<property name="buddy">
<cstring>loopFilterBox</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1">
<widget class="QComboBox" name="loopFilterBox"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
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