vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Jul 5 18:51:42 2010 +0200| [d3ad0ff17cd425bf072026e38c239596ee8523ab] | committer: Jean-Baptiste Kempf
Qt: spref small rework of video and codecs part Move the skip-frame pref from video to codecs > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3ad0ff17cd425bf072026e38c239596ee8523ab --- modules/gui/qt4/components/simple_preferences.cpp | 2 +- modules/gui/qt4/ui/sprefs_input.ui | 89 ++++++++++----------- modules/gui/qt4/ui/sprefs_video.ui | 30 +++---- 3 files changed, 56 insertions(+), 65 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index b8003ca..f56468a 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -216,7 +216,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_BOOL( "overlay", overlay ); CONFIG_BOOL( "video-on-top", alwaysOnTop ); CONFIG_BOOL( "video-deco", windowDecorations ); - CONFIG_BOOL( "skip-frames", skipFrames ); CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule ); CONFIG_BOOL( "video-wallpaper", wallpaperMode ); @@ -455,6 +454,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.DVDDevice ); optionWidgets.append( ui.cachingCombo ); CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox ); + CONFIG_BOOL( "skip-frames", skipFrames ); CONFIG_GENERIC( "sout-x264-tune", StringList, ui.x264Label, tuneBox ); CONFIG_GENERIC( "sout-x264-preset", StringList, ui.x264Label, presetBox ); CONFIG_GENERIC( "sout-x264-profile", StringList, ui.x264profileLabel, profileBox ); diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index 6e94502..b391373 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -7,8 +7,8 @@ <rect> <x>0</x> <y>0</y> - <width>680</width> - <height>537</height> + <width>737</width> + <height>635</height> </rect> </property> <property name="windowTitle"> @@ -70,76 +70,41 @@ </property> </widget> </item> - <item row="7" column="1"> + <item row="7" column="1" colspan="2"> <widget class="QComboBox" name="loopFilterBox"/> </item> - <item row="10" column="0"> + <item row="13" column="0"> <widget class="QLabel" name="x264Label"> <property name="text"> <string>x264 profile and level selection</string> </property> <property name="buddy"> - <cstring>profileBox</cstring> <cstring>levelBox</cstring> </property> </widget> </item> - <item row="10" column="1"> + <item row="13" column="1"> <widget class="QComboBox" name="profileBox"/> </item> - <item row="10" column="2"> + <item row="13" column="2"> <widget class="QLineEdit" name="levelBox"/> </item> - <item row="9" column="0"> + <item row="12" column="0"> <widget class="QLabel" name="x264profileLabel"> <property name="text"> <string>x264 preset and tuning selection</string> </property> <property name="buddy"> - <cstring>presetBox</cstring> <cstring>tuneBox</cstring> </property> </widget> </item> - <item row="9" column="1"> + <item row="12" column="1"> <widget class="QComboBox" name="presetBox"/> </item> - <item row="9" column="2"> + <item row="12" column="2"> <widget class="QComboBox" name="tuneBox"/> </item> - <item row="2" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QSpinBox" name="PostProcLevel"> - <property name="alignment"> - <set>Qt::AlignRight</set> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>26</number> - </property> - <property name="value"> - <number>6</number> - </property> - </widget> - </item> - <item> - <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> - </layout> - </item> <item row="2" column="0"> <widget class="QLabel" name="ppLabel"> <property name="minimumSize"> @@ -163,13 +128,46 @@ </property> </widget> </item> - <item row="8" column="0"> + <item row="8" column="0" colspan="3"> + <widget class="QCheckBox" name="skipFrames"> + <property name="text"> + <string>Skip frames</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QSpinBox" name="PostProcLevel"> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>26</number> + </property> + <property name="value"> + <number>6</number> + </property> + </widget> + </item> + <item row="10" column="0"> <widget class="QCheckBox" name="systemCodecBox"> <property name="text"> <string>Use system codecs if available (better quality, but dangerous)</string> </property> </widget> </item> + <item row="11" column="0" colspan="3"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> </layout> </widget> </item> @@ -353,7 +351,6 @@ <tabstop>live555TransportHTTPRadio</tabstop> <tabstop>live555TransportRTSP_TCPRadio</tabstop> <tabstop>cachingCombo</tabstop> - <tabstop>PostProcLevel</tabstop> <tabstop>hwAccelBox</tabstop> <tabstop>loopFilterBox</tabstop> </tabstops> diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui index b9bfb45..af9f0e7 100644 --- a/modules/gui/qt4/ui/sprefs_video.ui +++ b/modules/gui/qt4/ui/sprefs_video.ui @@ -7,7 +7,7 @@ <rect> <x>0</x> <y>0</y> - <width>820</width> + <width>816</width> <height>626</height> </rect> </property> @@ -57,14 +57,14 @@ </property> </widget> </item> - <item row="5" column="1" colspan="2"> + <item row="7" column="1" colspan="2"> <widget class="QComboBox" name="outputModule"> <property name="maxVisibleItems"> <number>15</number> </property> </widget> </item> - <item row="5" column="0"> + <item row="7" column="0"> <widget class="QLabel" name="voutLabel"> <property name="text"> <string>Output</string> @@ -84,17 +84,14 @@ </property> </widget> </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="skipFrames"> + <item row="3" column="0"> + <widget class="QCheckBox" name="hwYUVBox"> <property name="text"> - <string>Skip frames</string> - </property> - <property name="checked"> - <bool>true</bool> + <string>Use hardware YUV->RGB conversions</string> </property> </widget> </item> - <item row="3" column="2"> + <item row="2" column="2"> <widget class="QCheckBox" name="windowDecorations"> <property name="text"> <string>Window decorations</string> @@ -104,13 +101,6 @@ </property> </widget> </item> - <item row="2" column="2"> - <widget class="QCheckBox" name="hwYUVBox"> - <property name="text"> - <string>Use hardware YUV->RGB conversions</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -303,10 +293,14 @@ <tabstop>fullscreen</tabstop> <tabstop>overlay</tabstop> <tabstop>alwaysOnTop</tabstop> - <tabstop>skipFrames</tabstop> + <tabstop>windowDecorations</tabstop> + <tabstop>hwYUVBox</tabstop> <tabstop>outputModule</tabstop> <tabstop>wallpaperMode</tabstop> <tabstop>dXdisplayDevice</tabstop> + <tabstop>deinterlaceBox</tabstop> + <tabstop>deinterlaceModeBox</tabstop> + <tabstop>arLine</tabstop> <tabstop>snapshotsDirectory</tabstop> <tabstop>snapshotsDirectoryBrowse</tabstop> <tabstop>snapshotsPrefix</tabstop> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
