X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=2d35fb1bdeabfe9eb9eb261b8765c677bf54cdea;hb=b96c13d1a06d3f3fa07abd9e908112086e04c724;hp=13a270d6a0db51d34eeb608bad614e9c5a1cd0b4;hpb=4717c1acae228e87966eec473fae4ab7495af7e0;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 13a270d6a0..2d35fb1bde 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -1,11 +1,12 @@ /***************************************************************************** * simple_preferences.cpp : "Simple preferences" **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright (C) 2006-2007 the VideoLAN team * $Id: preferences.cpp 16348 2006-08-25 21:10:10Z zorglub $ * * 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 @@ -24,82 +25,74 @@ #include "components/simple_preferences.hpp" #include "components/preferences_widgets.hpp" -#include "qt4.hpp" -#include -#include -#include -#include -#include -#include -#include "pixmaps/advanced_50x50.xpm" -#include "pixmaps/audio_50x50.xpm" -#include "pixmaps/input_and_codecs_50x50.xpm" -#include "pixmaps/interface_50x50.xpm" -#include "pixmaps/playlist_50x50.xpm" -#include "pixmaps/subtitles_50x50.xpm" -#include "pixmaps/video_50x50.xpm" - -#include "ui/sprefs_trivial.h" #include "ui/sprefs_audio.h" +#include "ui/sprefs_input.h" #include "ui/sprefs_video.h" #include "ui/sprefs_subtitles.h" -#include "ui/sprefs_playlist.h" +#include "ui/sprefs_hotkeys.h" #include "ui/sprefs_interface.h" -#define ITEM_HEIGHT 50 +#include + +#include +#include +#include +#include +#include +#include + +#define ICON_HEIGHT 64 +#define BUTTON_HEIGHT 74 /********************************************************************* * 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 ); + + SPrefsInterface->setChecked( true ); + layout->setMargin( 0 ); + layout->setSpacing( 1 ); + + this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); + setLayout( layout ); -#ifndef WIN32 - // Fixme - A bit UGLY - QFont f = font(); - int pSize = f.pointSize(); - if( pSize > 0 ) - f.setPointSize( pSize + 1 ); - else - f.setPixelSize( f.pixelSize() + 1 ); - setFont( f ); -#endif - -#define ADD_CATEGORY( id, label, icon ) \ - addItem( label ); \ - item( id )->setIcon( QIcon( QPixmap( icon ) ) ); \ - item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) ); - - ADD_CATEGORY( SPrefsVideo, "Video", video_50x50_xpm ); - ADD_CATEGORY( SPrefsAudio, "Audio", audio_50x50_xpm ); - ADD_CATEGORY( SPrefsInputAndCodecs, "Input and Codecs", - input_and_codecs_50x50_xpm ); - ADD_CATEGORY( SPrefsPlaylist, "Playlist", playlist_50x50_xpm ); - ADD_CATEGORY( SPrefsInterface, "Interface", interface_50x50_xpm ); - ADD_CATEGORY( SPrefsSubtitles, "Subtitles", subtitles_50x50_xpm ); - ADD_CATEGORY( SPrefsAdvanced, "Advanced", advanced_50x50_xpm ); - - setCurrentRow( SPrefsInterface ); -} - -void SPrefsCatList::applyAll() -{ - doAll( false ); -} - -void SPrefsCatList::cleanAll() -{ - doAll( true ); } -/// \todo When cleaning, we should remove the panel ? -void SPrefsCatList::doAll( bool doclean ) +void SPrefsCatList::switchPanel( int i ) { - /* Todo */ + emit currentItemChanged( i ); } /********************************************************************* @@ -120,62 +113,205 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, controls.append( control ); \ } -#define START_SPREFS_CAT( name ) \ - case SPrefs ## name: \ - { \ - Ui::SPrefs ## name ui; \ - ui.setupUi( this ); +#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: \ + { \ + Ui::SPrefs ## name ui; \ + ui.setupUi( panel ); \ + panel_label->setText( label ); #define END_SPREFS_CAT \ break; \ } + QVBoxLayout *panel_layout = new QVBoxLayout(); + QWidget *panel = new QWidget(); + panel_layout->setMargin( 3 ); + + // Title Label + QLabel *panel_label = new QLabel; + QFont labelFont = QApplication::font( static_cast(0) ); + labelFont.setPointSize( labelFont.pointSize() + 6 ); + labelFont.setFamily( "Verdana" ); + panel_label->setFont( labelFont ); + + // Title
+ QFrame *title_line = new QFrame; + title_line->setFrameShape(QFrame::HLine); + title_line->setFrameShadow(QFrame::Sunken); + + QFont italicFont = QApplication::font( static_cast(0) ); + italicFont.setItalic( true ); switch( number ) { - START_SPREFS_CAT( Video ); - + /* Video Panel Implementation */ + START_SPREFS_CAT( Video , qtr("General video settings") ); CONFIG_GENERIC( "video", Bool, NULL, enableVideo ); CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen ); CONFIG_GENERIC( "overlay", Bool, NULL, overlay ); CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop ); CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations ); - + CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames ); + CONFIG_GENERIC( "overlay", Bool, NULL, overlay ); CONFIG_GENERIC( "vout", Module, NULL, outputModule ); - CONFIG_GENERIC( "snapshot-path", String, NULL, - snapshotsDirectory ); /* FIXME -> use file instead of string */ +#ifdef WIN32 + CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); + CONFIG_GENERIC( "directx-device", StringList, NULL, + dXdisplayDevice ); +#else + ui.directXBox->setVisible( false ); +#endif + + CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL, + snapshotsDirectory, snapshotsDirectoryBrowse ); CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix ); CONFIG_GENERIC( "snapshot-sequential", Bool, NULL, snapshotsSequentialNumbering ); CONFIG_GENERIC( "snapshot-format", StringList, NULL, snapshotsFormat ); + END_SPREFS_CAT; - END_SPREFS_CAT; + /* Audio Panel Implementation */ + START_SPREFS_CAT( Audio, qtr("General audio settings") ); + + CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); - START_SPREFS_CAT( Audio ); + CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, + defaultVolume ); + CONFIG_GENERIC( "audio-language" , String , NULL, + preferredAudioLanguage ); - CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); + CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox ); + CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, + detectionDolby ); + CONFIG_GENERIC( "aout" , Module , NULL, outputModule ); + CONNECT( control, Updated(), this, AudioDeviceChanged() ); + QString aout_value = (dynamic_cast(control))->getValue(); +#ifndef WIN32 + CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice ); + alsa_options = control; + CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice, + OSSBrowse ); + oss_options = control; +#else + CONFIG_GENERIC( "directx-audio-device" , IntegerList, ui.DirectXLabel, + DirectXDevice ); + directx_options = control; +#endif + CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.FileLabel, FileName, + fileBrowseButton ); + file_options = control; + +#ifdef WIN32 + ui.OSSBrowse->hide(); + ui.OSSDevice->hide(); + ui.OSSLabel->hide(); + ui.alsaDevice->hide(); + ui.alsaLabel->hide(); +#else + ui.DirectXLabel->setVisible( false ); + ui.DirectXDevice->setVisible( false ); +#endif + + updateAudioOptions( aout_value ); + + CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); +// 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; - case SPrefsInputAndCodecs: break; + /* Input and Codecs Panel Implementation */ + START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); + /* Disk Devices */ +/* CONFIG_GENERIC( );*/ //FIXME - START_SPREFS_CAT( Playlist ); + CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); + CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); + + /* Caching */ +/* CONFIG_GENERIC( );*/ //FIXME + + 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 ); +#ifdef WIN32 + CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); +#else + ui.systemCodecBox->hide(); +#endif + 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; - START_SPREFS_CAT( Interface ); + /* Interface Panel */ + START_SPREFS_CAT( Interface, qtr("Interface settings") ); + ui.defaultLabel->setFont( italicFont ); + ui.skinsLabel->setFont( italicFont ); +#if defined( WIN32 ) || defined (__APPLE__) CONFIG_GENERIC( "language", StringList, NULL, language ); +#else + ui.language->hide(); + ui.languageLabel->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 ); + } + //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 ); +#else + ui.OneInterfaceBox->hide(); +#endif END_SPREFS_CAT; - START_SPREFS_CAT( Subtitles ); + START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") ); + CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); - CONFIG_GENERIC( "sub-language", String, NULL, preferedLanguage ); - CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */ + CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage ); + CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, + fontBrowse ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, fontSize ); @@ -183,37 +319,59 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; - case SPrefsAdvanced: break; - } + START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" ); + //FIMXE + END_SPREFS_CAT; + } + + panel_layout->addWidget(panel_label); + panel_layout->addWidget(title_line); + panel_layout->addWidget( panel ); + panel_layout->addStretch( 2 ); + + this->setLayout(panel_layout); +} + +void SPrefsPanel::AudioDeviceChanged() +{ + ModuleConfigControl *module_config = + dynamic_cast( sender() ); + updateAudioOptions( module_config->getValue() ); } -void SPrefsPanel::Apply() +void SPrefsPanel::updateAudioOptions( QString value ) +{ +#ifndef WIN32 + alsa_options->hide(); + oss_options->hide(); +#else + directx_options->hide(); +#endif + file_options->hide(); + + if( value == "aout_file" ) + file_options->show(); +#ifndef WIN32 + else if( value == "alsa" ) + alsa_options->show(); + else if( value == "oss" ) + oss_options->show(); +#else + else if( value == "directx" ) + directx_options->show(); +#endif +} + +void SPrefsPanel::apply() { - /* todo: factorize with PrefsPanel */ QList::Iterator i; for( i = controls.begin() ; i != controls.end() ; i++ ) { - VIntConfigControl *vicc = qobject_cast(*i); - if( !vicc ) - { - VFloatConfigControl *vfcc = qobject_cast(*i); - if( !vfcc) - { - VStringConfigControl *vscc = - qobject_cast(*i); - assert( vscc ); - config_PutPsz( p_intf, vscc->getName(), - vscc->getValue().toAscii().data() ); - continue; - } - config_PutFloat( p_intf, vfcc->getName(), - vfcc->getValue() ); - continue; - } - config_PutInt( p_intf, vicc->getName(), - vicc->getValue() ); + ConfigControl *c = qobject_cast(*i); + c->doApply( p_intf ); } } -void SPrefsPanel::Clean() +void SPrefsPanel::clean() {} +