X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=5e7944846a8fa5c61a7f076dd7b21ef49fa4c2a9;hb=031dc0b0f7a2c162e396ed676bb1887a1249e449;hp=c2b0b650a60d4fbbb5bdd5b9ed4c9d0f565ff090;hpb=7bb4a6ef55444f256c11190378e57c430db67afe;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index c2b0b650a6..5e7944846a 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 @@ -22,24 +23,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include #include #include +#include +#include +#include #include "components/simple_preferences.hpp" #include "components/preferences_widgets.hpp" #include "qt4.hpp" #include -#include - -#include "pixmaps/hotkeys_50x50.xpm" -#include "pixmaps/audio_50x50.xpm" -#include "pixmaps/input_and_codecs_50x50.xpm" -#include "pixmaps/interface_50x50.xpm" -#include "pixmaps/subtitles_50x50.xpm" -#include "pixmaps/video_50x50.xpm" #include "ui/sprefs_audio.h" #include "ui/sprefs_input.h" @@ -48,31 +42,54 @@ #include "ui/sprefs_hotkeys.h" #include "ui/sprefs_interface.h" -#define ITEM_HEIGHT 50 +#define ICON_HEIGHT 64 +#define BUTTON_HEIGHT 76 /********************************************************************* * The List of categories *********************************************************************/ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : - QListWidget( _parent ), p_intf( _p_intf ) + QWidget( _parent ), p_intf( _p_intf ) { - setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) ); - setAlternatingRowColors( true ); + QVBoxLayout *layout = new QVBoxLayout(); + + QButtonGroup *buttonGroup = new QButtonGroup( this ); + buttonGroup->setExclusive ( true ); + CONNECT( buttonGroup, buttonClicked ( int ), + this, switchPanel( int ) ); + +#define ADD_CATEGORY( button, label, icon, numb ) \ + QToolButton * button = new QToolButton( this ); \ + button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \ + button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \ + button->setText( label ); \ + button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \ + button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT); \ + button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ; \ + button->setAutoRaise( true ); \ + button->setCheckable( true ); \ + buttonGroup->addButton( button, numb ); \ + layout->addWidget( button ); + + ADD_CATEGORY( SPrefsInterface, qtr("Interface"), + spref_cone_Interface_64.png, 0 ); + ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 ); + ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 ); + ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), + spref_cone_Subtitles_64.png, 3 ); + ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"), + spref_cone_Input_64.png, 4 ); + ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 ); -#define ADD_CATEGORY( id, label, icon ) \ - addItem( label ); \ - item( id )->setIcon( QIcon( QPixmap( icon ) ) ); \ - item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) ); + SPrefsInterface->setChecked( true ); - ADD_CATEGORY( SPrefsVideo, qtr("Video"), video_50x50_xpm ); - ADD_CATEGORY( SPrefsAudio, qtr("Audio"), audio_50x50_xpm ); - ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"), - input_and_codecs_50x50_xpm ); - ADD_CATEGORY( SPrefsInterface, qtr("Interface"), interface_50x50_xpm ); - ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), subtitles_50x50_xpm ); - ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), hotkeys_50x50_xpm ); + this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); + setLayout( layout ); +} - setCurrentRow( SPrefsInterface ); +void SPrefsCatList::switchPanel( int i ) +{ + emit currentItemChanged( i ); } /********************************************************************* @@ -93,6 +110,25 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, controls.append( control ); \ } +#define CONFIG_GENERIC_NO_BOOL( option, type, label, qcontrol ) \ + p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ + if( p_config ) \ + { \ + control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ + p_config, label, ui.qcontrol ); \ + controls.append( control ); \ + } + +#define CONFIG_GENERIC_FILE( option, type, label, qcontrol, qbutton ) \ + p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ + if( p_config ) \ + { \ + control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ + p_config, label, ui.qcontrol, ui.qbutton, \ + false ); \ + controls.append( control ); \ + } + #define START_SPREFS_CAT( name , label ) \ case SPrefs ## name: \ { \ @@ -110,8 +146,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, // Title Label QLabel *panel_label = new QLabel; QFont labelFont = QApplication::font( static_cast(0) ); - labelFont.setPointSize( labelFont.pointSize() + 4 ); - labelFont.setBold( true ); + labelFont.setPointSize( labelFont.pointSize() + 6 ); + labelFont.setFamily( "Verdana" ); panel_label->setFont( labelFont ); // Title
@@ -119,8 +155,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, title_line->setFrameShape(QFrame::HLine); title_line->setFrameShadow(QFrame::Sunken); + QFont italicFont = QApplication::font( static_cast(0) ); + italicFont.setItalic( true ); + switch( number ) { + /* Video Panel Implementation */ START_SPREFS_CAT( Video , "General video settings" ); #ifndef WIN32 ui.directXBox->setVisible( false ); @@ -136,11 +176,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #ifdef WIN32 CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); - // CONFIG_GENERIC( "directx-device", String, NULL, dXdisplayDevice ); + CONFIG_GENERIC( "directx-device", StringList, NULL, + dXdisplayDevice ); #endif - CONFIG_GENERIC( "snapshot-path", String, NULL, - snapshotsDirectory ); /* FIXME -> use file instead of string */ + CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL, + snapshotsDirectory, snapshotsDirectoryBrowse ); CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix ); CONFIG_GENERIC( "snapshot-sequential", Bool, NULL, snapshotsSequentialNumbering ); @@ -148,6 +189,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, snapshotsFormat ); END_SPREFS_CAT; + /* Audio Panel Implementation */ START_SPREFS_CAT( Audio, "General audio settings" ); #ifdef WIN32 ui.OSSBrowse->hide(); @@ -161,48 +203,86 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #endif CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); - CONFIG_GENERIC( "volume" , IntegerRangeSlider, NULL, defaultVolume ); + CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, + defaultVolume ); + CONFIG_GENERIC( "audio-language" , StringList , NULL, + preferredAudioLanguage ); //FIXME -/* CONFIG_GENERIC( "audio-language" , String , NULL, - preferredAudioLanguage ); */ //FIXME WHy ? CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox ); -/* CONFIG_GENERIC( "force-dolby-surround" , Integer , NULL, - detectionDolby );*/ + CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, + detectionDolby ); CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); #ifndef WIN32 -/* CONFIG_GENERIC( "alsadev" , String , NULL, alsaDevice );*/ - CONFIG_GENERIC( "dspdev" , String , NULL, OSSDevice );//FIXME File + CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice ); + CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse ); #else -/* CONFIG_GENERIC( "directx-audio-device" , Integer, NULL, - DirectXDevice );*/ + CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, + DirectXDevice ); #endif - CONFIG_GENERIC( "audiofile-file" , String , NULL, FileName ); //Fixme File - + CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName, + fileBrowseButton ); CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); -#if 0 // Not found for normalizer effect - CONFIG_GENERIC( "" , , NULL, ); -#endif +// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME + CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, + volNormalizer ); CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); - END_SPREFS_CAT; + /* Input and Codecs Panel Implementation */ START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" ); + /* Disk Devices */ +/* CONFIG_GENERIC( );*/ //FIXME - END_SPREFS_CAT; + CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); + CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); - START_SPREFS_CAT( Interface, "Interfaces settings" ); + /* Caching */ +/* CONFIG_GENERIC( );*/ //FIXME - CONFIG_GENERIC( "language", StringList, NULL, language ); + CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); + CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); + CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); + CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox ); + CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox ); +// CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record + END_SPREFS_CAT; + + /* Interface Panel */ + START_SPREFS_CAT( Interface, "Interface settings" ); + ui.defaultLabel->setFont( italicFont ); + ui.skinsLabel->setFont( italicFont ); + + CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME +#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 ) + ui.OneInterfaceBox->hide(); +#endif + /* 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( "qt-always-video", Bool, NULL, qtAlwaysVideo ); + CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, + skinBrowse ); +#if defined( WIN32 ) || defined(HAVE_DBUS_3) + CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); + CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, + EnqueueOneInterfaceMode ); +#endif END_SPREFS_CAT; START_SPREFS_CAT( Subtitles, "Subtitles & OSD settings" ); + CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); 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( "sub-language", String, NULL, preferredLanguage );//FIXME + CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, + fontBrowse ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, fontSize ); @@ -211,6 +291,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" ); + //FIMXE END_SPREFS_CAT; } @@ -234,3 +315,4 @@ void SPrefsPanel::apply() void SPrefsPanel::clean() {} +