From c6276f93df08f5b46b26983a6512a99536222757 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 24 Feb 2007 23:17:24 +0000 Subject: [PATCH] Qt4 - Simple Prefs: More. Interfaces. --- .../gui/qt4/components/simple_preferences.cpp | 10 ++--- .../gui/qt4/components/simple_preferences.hpp | 2 +- modules/gui/qt4/ui/sprefs_input.ui | 19 ++++++--- modules/gui/qt4/ui/sprefs_interface.ui | 42 ++++++++++++++++--- 4 files changed, 57 insertions(+), 16 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 59f167f68b..9804020f0a 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -38,7 +38,7 @@ #include "pixmaps/audio_50x50.xpm" #include "pixmaps/input_and_codecs_50x50.xpm" #include "pixmaps/interface_50x50.xpm" -#include "pixmaps/playlist_50x50.xpm" +//#include "pixmaps/playlist_50x50.xpm" #include "pixmaps/subtitles_50x50.xpm" #include "pixmaps/video_50x50.xpm" @@ -46,7 +46,7 @@ #include "ui/sprefs_input.h" #include "ui/sprefs_video.h" #include "ui/sprefs_subtitles.h" -#include "ui/sprefs_playlist.h" +//#include "ui/sprefs_playlist.h" #include "ui/sprefs_interface.h" #define ITEM_HEIGHT 50 @@ -69,7 +69,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : ADD_CATEGORY( SPrefsAudio, qtr("Audio"), audio_50x50_xpm ); ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"), input_and_codecs_50x50_xpm ); - ADD_CATEGORY( SPrefsPlaylist, qtr("Playlist"), playlist_50x50_xpm ); +// ADD_CATEGORY( SPrefsPlaylist, qtr("Playlist"), playlist_50x50_xpm ); ADD_CATEGORY( SPrefsInterface, qtr("Interface"), interface_50x50_xpm ); ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), subtitles_50x50_xpm ); ADD_CATEGORY( SPrefsAdvanced, qtr("Advanced"), advanced_50x50_xpm ); @@ -140,8 +140,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; - START_SPREFS_CAT( Playlist ); - END_SPREFS_CAT; +/* START_SPREFS_CAT( Playlist ); + END_SPREFS_CAT;*/ START_SPREFS_CAT( Interface ); diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp index f8f67adb75..4f0358fd49 100644 --- a/modules/gui/qt4/components/simple_preferences.hpp +++ b/modules/gui/qt4/components/simple_preferences.hpp @@ -32,7 +32,7 @@ enum { SPrefsVideo = 0, SPrefsAudio, SPrefsInputAndCodecs, - SPrefsPlaylist, +// SPrefsPlaylist, SPrefsInterface, SPrefsSubtitles, SPrefsAdvanced, diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index b12071472b..46862d9d0e 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -91,21 +91,28 @@ Network - + 9 6 - + + + + HTTP Proxy + + + + UDP Default Port - + Qt::AlignRight @@ -121,6 +128,9 @@ + + + @@ -267,7 +277,7 @@ - + Default Network caching in ms @@ -292,7 +302,6 @@ - diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index ac11968b15..3c08e90c9c 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -6,7 +6,7 @@ 0 0 400 - 357 + 297 @@ -19,6 +19,35 @@ 6 + + + + Instances + + + + 9 + + + 6 + + + + + Allow only one interface + + + + + + + Enqueue files in playlist when in one interface mode + + + + + + @@ -34,7 +63,10 @@ - This is VLC's skinnable interface. You can download skins on <a href="http://www.videolan.org/">http://www.videolan.org/</a> to customize your player. + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This is VLC's skinnable interface. You can download skins on <a href="http://www.videolan.org/"><span style=" text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php</span></a> to customize your player.</p></body></html> true @@ -68,9 +100,6 @@ - - - @@ -78,6 +107,9 @@ + + + -- 2.20.1