From aa8da70e76f4f41cf1038ad09c927f6a90b7cfb7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sat, 3 Mar 2007 23:39:36 +0000 Subject: [PATCH] Qt4 - SPrefs : a few additions. Still not working for selecting interface. --- .../gui/qt4/components/simple_preferences.cpp | 23 +++- modules/gui/qt4/ui/sprefs_interface.ui | 103 +++++++++++------- 2 files changed, 83 insertions(+), 43 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 8c03b35797..724627e549 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -7,6 +7,7 @@ * Authors: Clément Stenac * Antoine Cellerier * Jean-Baptiste Kempf + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -190,12 +191,14 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); #ifndef WIN32 CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice ); - CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File + CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice ); + //FIXME File #else CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, DirectXDevice ); #endif - CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File + CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); + //Fixme File CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); // CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer @@ -228,9 +231,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, START_SPREFS_CAT( Interface, "Interfaces settings" ); CONFIG_GENERIC( "language", StringList, NULL, language ); + /* interface */ +/* p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" ); + if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" )) + ui.qt4->setChecked( true ); + if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" )) + ui.skins->setChecked( true );*/ /* CONFIG_GENERIC( "intf", Module, NULL, ??? ); */ //FIXME interface choice - CONFIG_GENERIC ("one-instance", Bool, NULL, OneInterfaceMode ); - CONFIG_GENERIC ("playlist-enqueue", Bool, NULL, + CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); + CONFIG_GENERIC( "skins2-last", String, NULL, fileSkin); + //FIXME File + CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); + CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, EnqueueOneInterfaceMode ); END_SPREFS_CAT; @@ -240,7 +252,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage ); - CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */ + CONFIG_GENERIC( "freetype-font", String, NULL, font ); + /* FIXME -> use file instead of string */ CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, fontSize ); diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index 3c08e90c9c..73760c71cd 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -5,8 +5,8 @@ 0 0 - 400 - 297 + 440 + 373 @@ -19,81 +19,108 @@ 6 - - + + - Instances + Default Interface - + 9 6 - - + + - Allow only one interface + Browse - - - - Enqueue files in playlist when in one interface mode - - + + - - - - - - - Default Interface - - - - 9 - - - 6 - - + <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> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">This is VLC's skinnable interface. You can download skins on </span><a href="http://www.videolan.org/"><span style=" font-style:italic; text-decoration: underline; color:#0000ff;">http://www.videolan.org/vlc/skins.php</span></a><span style=" font-style:italic;"> to customize your player.</span></p></body></html> true - + - VLC's default interface, with native look and feel + <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;"><span style=" font-style:italic;">VLC's default interface, with native look and feel</span></p></body></html> true - + + + + Default + + + + + + + Skin File + + + + Skins - - + + - Default + Display always the video + + + + + + + + + + Instances + + + + 9 + + + 6 + + + + + Allow only one interface + + + + + + + Enqueue files in playlist when in one interface mode -- 2.39.2