From: Jean-Baptiste Kempf Date: Sun, 19 Sep 2010 22:08:48 +0000 (+0200) Subject: Qt: Simple preferences simplifications X-Git-Tag: 1.2.0-pre1~5251 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f4362a24bf6d9c93c78455988505fd184a5e5316;p=vlc Qt: Simple preferences simplifications --- diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui index d6c818a9a1..67488df3b8 100644 --- a/modules/gui/qt4/ui/sprefs_audio.ui +++ b/modules/gui/qt4/ui/sprefs_audio.ui @@ -7,8 +7,8 @@ 0 0 - 661 - 670 + 703 + 656 @@ -253,48 +253,7 @@ false - - - - - 0 - 0 - - - - - 250 - 0 - - - - - 250 - 16777215 - - - - Dolby Surround: - - - detectionDolby - - - - - - - - 0 - 0 - - - - -1 - - - - + @@ -319,7 +278,7 @@ - + true @@ -329,7 +288,7 @@ - + Qt::Horizontal @@ -342,8 +301,8 @@ - - + + 250 @@ -351,15 +310,15 @@ - Replay gain mode: + Visualization: - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + visualisation - - + + 0 @@ -368,49 +327,90 @@ - - + + + + Enable Time-Stretching audio + + + + + + + + 0 + 0 + + 250 0 + + + 250 + 16777215 + + - Visualization: + Dolby Surround: - visualisation + detectionDolby - - + + 0 0 + + -1 + - - + + + + + 250 + 0 + + + + Replay gain mode: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + 0 0 - - Headphone surround effect - - - + + + + + 0 + 0 + + - Enable Time-Stretching audio + Headphone surround effect diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index fbb2140419..33b4856251 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -60,23 +60,7 @@ Codecs - - - - - 250 - 0 - - - - Skip H.264 in-loop deblocking filter - - - loopFilterBox - - - - + @@ -157,6 +141,49 @@ + + + + Qt::Horizontal + + + + + + + + + + + 0 + 0 + + + + + + + + + 250 + 0 + + + + Skip H.264 in-loop deblocking filter + + + loopFilterBox + + + + + + + Use systems codecs if available, for WMV codecs + + + @@ -179,33 +206,6 @@ - - - - Use system codecs if available (better quality, but dangerous) - - - - - - - Qt::Horizontal - - - - - - - - - - - 0 - 0 - - - - @@ -215,16 +215,6 @@ Files - - - - Damaged or incomplete AVI file - - - AviRepair - - - @@ -252,9 +242,26 @@ - + + + + Damaged or incomplete AVI file + + + AviRepair + + + + + + + + Qt::Horizontal + + + @@ -264,26 +271,7 @@ Network - - - - - 250 - 0 - - - - Default port (server mode) - - - 0 - - - UDPPort - - - - + HTTP proxy URL @@ -293,23 +281,10 @@ - + - - - - Default caching policy - - - cachingCombo - - - - - - @@ -333,15 +308,60 @@ - + Live555 stream transport + + + + Default caching policy + + + cachingCombo + + + + + + + + + + 250 + 0 + + + + Default port (server mode) + + + 0 + + + UDPPort + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -358,19 +378,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -381,14 +388,11 @@ DVDDevice DVDBrowse - AviRepair recordPath recordBrowse - UDPPort proxy live555TransportHTTPRadio live555TransportRTSP_TCPRadio - cachingCombo hwAccelBox loopFilterBox diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index 230254a04f..9964545afb 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -7,8 +7,8 @@ 0 0 - 664 - 555 + 697 + 590 @@ -36,9 +36,6 @@ Instances - - 0 - 9 @@ -48,6 +45,9 @@ 9 + + 0 + @@ -147,7 +147,7 @@ - Activate update notifier + Activate updates notifier @@ -283,6 +283,39 @@ Look and feel + + + + This is VLC's default interface, with a native look and feel. + + + Use native style + + + true + + + + + + + Use custom skin + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -541,39 +574,6 @@ - - - - This is VLC's default interface, with a native look and feel. - - - Use native style - - - true - - - - - - - Use custom skin - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui index d37b04e8a0..cc2b314968 100644 --- a/modules/gui/qt4/ui/sprefs_subtitles.ui +++ b/modules/gui/qt4/ui/sprefs_subtitles.ui @@ -7,7 +7,7 @@ 0 0 - 772 + 758 446 @@ -101,7 +101,7 @@ - Display Settings + Subtitles effects diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui index af9f0e755a..89eb1d657e 100644 --- a/modules/gui/qt4/ui/sprefs_video.ui +++ b/modules/gui/qt4/ui/sprefs_video.ui @@ -7,8 +7,8 @@ 0 0 - 816 - 626 + 699 + 615 @@ -57,14 +57,14 @@ - + 15 - + Output @@ -74,30 +74,24 @@ - - + + - Accelerated video output (Overlay) - - - true + Window decorations - - + + - Use hardware YUV->RGB conversions + Accelerated video output (Overlay) - - + + - Window decorations - - - true + Use hardware YUV->RGB conversions @@ -129,7 +123,7 @@ - + Enable wallpaper mode @@ -257,9 +251,6 @@ - - - @@ -283,6 +274,9 @@ + + + @@ -291,10 +285,8 @@ enableVideo fullscreen - overlay alwaysOnTop windowDecorations - hwYUVBox outputModule wallpaperMode dXdisplayDevice @@ -305,8 +297,6 @@ snapshotsDirectoryBrowse snapshotsPrefix snapshotsSequentialNumbering - snapshotsFormat - overlay