X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=e6e391494ca5db132e8d8e237f15cf5f784290be;hb=0897392791630dfca3df538e46370ed555c2eda7;hp=63d93f1d43004d7b2bab963552f01747600b03b7;hpb=79873cd826344ae2ff8e36c852e4a3d3e3705aa3;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 63d93f1d43..e6e391494c 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -1,8 +1,8 @@ /***************************************************************************** * simple_preferences.cpp : "Simple preferences" **************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team - * $Id: preferences.cpp 16348 2006-08-25 21:10:10Z zorglub $ + * Copyright (C) 2006-2008 the VideoLAN team + * $Id$ * * Authors: Clément Stenac * Antoine Cellerier @@ -22,6 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -36,16 +37,19 @@ #include #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 ) : +SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool small ) : QWidget( _parent ), p_intf( _p_intf ) { QVBoxLayout *layout = new QVBoxLayout(); @@ -55,13 +59,15 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : CONNECT( buttonGroup, buttonClicked ( int ), this, switchPanel( int ) ); + short icon_height = small ? ICON_HEIGHT /2 : ICON_HEIGHT; + #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->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \ button->setText( label ); \ button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \ - button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT); \ + button->setIconSize( QSize( icon_height, icon_height ) ); \ + button->resize( icon_height + 6 , icon_height + 6 ); \ button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ; \ button->setAutoRaise( true ); \ button->setCheckable( true ); \ @@ -72,9 +78,9 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : 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"), + ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"), spref_cone_Subtitles_64.png, 3 ); - ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"), + ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"), spref_cone_Input_64.png, 4 ); ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 ); @@ -82,7 +88,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) : layout->setMargin( 0 ); layout->setSpacing( 1 ); - this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); + setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding); setLayout( layout ); } @@ -96,7 +102,7 @@ void SPrefsCatList::switchPanel( int i ) * The Panels *********************************************************************/ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, - int _number ) : QWidget( _parent ), p_intf( _p_intf ) + int _number, bool small ) : QWidget( _parent ), p_intf( _p_intf ) { module_config_t *p_config; ConfigControl *control; @@ -111,6 +117,16 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, controls.append( control ); \ } +#define CONFIG_GENERIC2( 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, qcontrol, false ); \ + controls.append( control ); \ + } + + #define CONFIG_GENERIC_NO_BOOL( option, type, label, qcontrol ) \ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ if( p_config ) \ @@ -125,8 +141,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, if( p_config ) \ { \ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ - p_config, label, ui.qcontrol, ui.qbutton, \ - false ); \ + p_config, label, qcontrol, qbutton ); \ controls.append( control ); \ } @@ -165,7 +180,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /****************************** * VIDEO Panel Implementation * ******************************/ - START_SPREFS_CAT( Video , qtr("General video settings") ); + START_SPREFS_CAT( Video , qtr("General Video Settings") ); CONFIG_GENERIC( "video", Bool, NULL, enableVideo ); CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen ); @@ -173,99 +188,137 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop ); CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations ); CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames ); - CONFIG_GENERIC( "vout", Module, NULL, outputModule ); + CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule ); #ifdef WIN32 CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); - CONFIG_GENERIC( "directx-device", StringList, NULL, + CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel, dXdisplayDevice ); + CONFIG_GENERIC( "directx-hw-yuv", Bool, NULL, hwYUVBox ); #else ui.directXBox->setVisible( false ); + ui.hwYUVBox->setVisible( false ); #endif - CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL, - snapshotsDirectory, snapshotsDirectoryBrowse ); - CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix ); + CONFIG_GENERIC( "deinterlace-mode", StringList, ui.deinterLabel, deinterlaceBox ); + CONFIG_GENERIC( "aspect-ratio", String, ui.arLabel, arLine ); + + CONFIG_GENERIC_FILE( "snapshot-path", Directory, ui.dirLabel, + ui.snapshotsDirectory, ui.snapshotsDirectoryBrowse ); + CONFIG_GENERIC( "snapshot-prefix", String, ui.prefixLabel, snapshotsPrefix ); CONFIG_GENERIC( "snapshot-sequential", Bool, NULL, snapshotsSequentialNumbering ); - CONFIG_GENERIC( "snapshot-format", StringList, NULL, + CONFIG_GENERIC( "snapshot-format", StringList, ui.arLabel, snapshotsFormat ); END_SPREFS_CAT; /****************************** * AUDIO Panel Implementation * ******************************/ - START_SPREFS_CAT( Audio, qtr("General audio settings") ); + START_SPREFS_CAT( Audio, qtr("General Audio Settings") ); CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); +#define audioCommon( name ) \ + QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \ + QHBoxLayout * name ## Layout = new QHBoxLayout( name ## Control); \ + name ## Layout->setMargin( 0 ); \ + name ## Layout->setSpacing( 0 ); \ + QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \ + name ## Label->setMinimumSize(QSize(100, 0)); \ + name ## Layout->addWidget( name ## Label ); \ + +#define audioControl( name) \ + audioCommon( name ) \ + QComboBox * name ## Device = new QComboBox( name ## Control ); \ + name ## Layout->addWidget( name ## Device ); \ + name ## Label->setBuddy( name ## Device ); \ + outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 ); + +#define audioControl2( name) \ + audioCommon( name ) \ + QLineEdit * name ## Device = new QLineEdit( name ## Control ); \ + name ## Layout->addWidget( name ## Device ); \ + name ## Label->setBuddy( name ## Device ); \ + QPushButton * name ## Browse = new QPushButton( qtr( "Browse..." ), name ## Control); \ + name ## Layout->addWidget( name ## Browse ); \ + outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 ); + /* hide if necessary */ -#ifdef WIN32 - ui.OSSControl->hide(); - ui.alsaControl->hide(); -#else - ui.DirectXControl->hide(); -#endif ui.lastfm_user_edit->hide(); ui.lastfm_user_label->hide(); ui.lastfm_pass_edit->hide(); ui.lastfm_pass_label->hide(); + /* Build if necessary */ + QGridLayout * outputAudioLayout = qobject_cast(ui.outputAudioBox->layout()); +#ifdef WIN32 + audioControl( DirectX ); + optionWidgets.append( DirectXControl ); + CONFIG_GENERIC2( "directx-audio-device", IntegerList, + NULL, DirectXDevice ); +#else + if( module_exists( "alsa" ) ) + { + audioControl( alsa ); + optionWidgets.append( alsaControl ); + + CONFIG_GENERIC2( "alsa-audio-device" , StringList, NULL, + alsaDevice ); + } + else + optionWidgets.append( NULL ); + if( module_exists( "oss" ) ) + { + audioControl2( OSS ); + optionWidgets.append( OSSControl ); + CONFIG_GENERIC_FILE( "oss-audio-device" , File, NULL, OSSDevice, + OSSBrowse ); + } + else + optionWidgets.append( NULL ); +#endif + /* General Audio Options */ CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, defaultVolume ); CONNECT( ui.defaultVolume, valueChanged( int ), this, updateAudioVolume( int ) ); - CONFIG_GENERIC( "audio-language" , String , NULL, + CONFIG_GENERIC( "audio-language" , String , ui.langLabel, preferredAudioLanguage ); CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox ); - CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, + CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox ); + CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel, detectionDolby ); - CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); - - CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, + CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL, volNormSpin ); - CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); + CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel, + visualisation); /* Audio Output Specifics */ - CONFIG_GENERIC( "aout", Module, NULL, outputModule ); + CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule ); CONNECT( ui.outputModule, currentIndexChanged( int ), this, updateAudioOptions( int ) ); -#ifndef WIN32 - if( module_Exists( p_intf, "alsa" ) ) - { - CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, - alsaDevice ); - } - if( module_Exists( p_intf, "oss" ) ) - { - CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice, - OSSBrowse ); - } -#else - CONFIG_GENERIC( "directx-audio-device", IntegerList, - ui.DirectXLabel, DirectXDevice ); -#endif - // File exists everywhere - CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel, - fileName, fileBrowseButton ); + /* File output exists on all platforms */ + CONFIG_GENERIC_FILE( "audiofile-file", File, ui.fileLabel, + ui.fileName, ui.fileBrowseButton ); - optionWidgets.append( ui.alsaControl ); - optionWidgets.append( ui.OSSControl ); - optionWidgets.append( ui.DirectXControl ); optionWidgets.append( ui.fileControl ); optionWidgets.append( ui.outputModule ); optionWidgets.append( ui.volNormBox ); + /*Little mofification of ui.volumeValue to compile with Qt < 4.3 */ + ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); optionWidgets.append( ui.volumeValue ); + optionWidgets.append( ui.headphoneEffect ); updateAudioOptions( ui.outputModule->currentIndex() ); /* LastFM */ - if( module_Exists( p_intf, "audioscrobbler" ) ) + if( module_exists( "audioscrobbler" ) ) { CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label, lastfm_user_edit ); @@ -276,22 +329,26 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.lastfm->setChecked( true ); else ui.lastfm->setChecked( false ); - CONNECT( ui.lastfm, stateChanged( int ), this , - lastfm_Changed( int ) ); + CONNECT( ui.lastfm, stateChanged( int ), + this, lastfm_Changed( int ) ); } else ui.lastfm->hide(); /* Normalizer */ - CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, setEnabled( bool ) ); - qs_filter = qfu( config_GetPsz( p_intf, "audio-filter" ) ); - bool b_normalizer = ( qs_filter.contains( "volnorm" ) ); - { - ui.volNormBox->setChecked( b_normalizer ); - ui.volNormSpin->setEnabled( b_normalizer ); - } + + char* psz = config_GetPsz( p_intf, "audio-filter" ); + qs_filter = qfu( psz ).split( ':', QString::SkipEmptyParts ); + free( psz ); + + bool b_enabled = ( qs_filter.contains( "volnorm" ) ); + ui.volNormBox->setChecked( b_enabled ); + ui.volNormSpin->setEnabled( b_enabled ); + + b_enabled = ( qs_filter.contains( "headphone" ) ); + ui.headphoneEffect->setChecked( b_enabled ); /* Volume Label */ updateAudioVolume( ui.defaultVolume->value() ); // First time init @@ -299,16 +356,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; /* Input and Codecs Panel Implementation */ - START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); + START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs Settings") ); /* Disk Devices */ { ui.DVDDevice->setToolTip( - //TODO: make this sentence understandable - qtr( "If this property is blank, then you have\n" - "values for DVD, VCD, and CDDA.\n" - "You can define a unique one or set that in" - "the advanced preferences" ) ); + qtr( "If this property is blank, different values\n" + "for DVD, VCD, and CDDA are set.\n" + "You can define a unique one or configure them \n" + "individually in the advanced preferences." ) ); char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" ); char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); @@ -318,44 +374,36 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, { ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); } - delete psz_cddadiscpath; delete psz_dvddiscpath; - delete psz_vcddiscpath; + free( psz_cddadiscpath ); + free( psz_dvddiscpath ); + free( psz_vcddiscpath ); } - CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); - CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); - CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); - CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); + CONFIG_GENERIC_NO_BOOL( "server-port", Integer, ui.portLabel, + UDPPort ); + CONFIG_GENERIC( "http-proxy", String , ui.httpProxyLabel, proxy ); + CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel, + PostProcLevel ); + CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair ); CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); #ifdef WIN32 CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); #else ui.systemCodecBox->hide(); #endif - /* Access Filters */ - qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) ); - ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) ); - ui.dumpBox->setChecked( qs_filter.contains( "dump" ) ); - ui.recordBox->setChecked( qs_filter.contains( "record" ) ); - ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) ); - - optionWidgets.append( ui.recordBox ); - optionWidgets.append( ui.dumpBox ); - optionWidgets.append( ui.bandwidthBox ); - optionWidgets.append( ui.timeshiftBox ); optionWidgets.append( ui.DVDDevice ); optionWidgets.append( ui.cachingCombo ); /* Caching */ /* Add the things to the ComboBox */ #define addToCachingBox( str, cachingNumber ) \ - ui.cachingCombo->addItem( str, QVariant( cachingNumber ) ); - addToCachingBox( "Custom", CachingCustom ); - addToCachingBox( "Lowest latency", CachingLowest ); - addToCachingBox( "Low latency", CachingLow ); - addToCachingBox( "Normal", CachingNormal ); - addToCachingBox( "High latency", CachingHigh ); - addToCachingBox( "Higher latency", CachingHigher ); + ui.cachingCombo->addItem( qtr(str), QVariant( cachingNumber ) ); + addToCachingBox( N_("Custom"), CachingCustom ); + addToCachingBox( N_("Lowest latency"), CachingLowest ); + addToCachingBox( N_("Low latency"), CachingLow ); + addToCachingBox( N_("Normal"), CachingNormal ); + addToCachingBox( N_("High latency"), CachingHigh ); + addToCachingBox( N_("Higher latency"), CachingHigher ); #define TestCaC( name ) \ b_cache_equal = b_cache_equal && \ @@ -369,9 +417,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, int i_cache = config_GetInt( p_intf, "file-caching"); TestCaC( "udp-caching" ); - if (module_Exists (p_intf, "dvdread")) + if (module_exists ("dvdread")) TestCaC( "dvdread-caching" ); - if (module_Exists (p_intf, "dvdnav")) + if (module_exists ("dvdnav")) TestCaC( "dvdnav-caching" ); TestCaC( "tcp-caching" ); TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); @@ -379,18 +427,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #ifdef WIN32 TestCaC( "dshow-caching" ); #else - if (module_Exists (p_intf, "v4l")) + if (module_exists ("v4l")) TestCaC( "v4l-caching" ); - if (module_Exists (p_intf, "access_jack")) + if (module_exists ("access_jack")) TestCaC( "jack-input-caching" ); - if (module_Exists (p_intf, "v4l2")) + if (module_exists ("v4l2")) TestCaC( "v4l2-caching" ); - if (module_Exists (p_intf, "pvr")) + if (module_exists ("pvr")) TestCaC( "pvr-caching" ); #endif TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); TestCaCi( "http-caching", 4 ); - if (module_Exists (p_intf, "access_realrtsp")) + if (module_exists ("access_realrtsp")) TestCaCi( "realrtsp-caching", 10 ); TestCaCi( "mms-caching", 19 ); if( b_cache_equal ) ui.cachingCombo->setCurrentIndex( @@ -400,12 +448,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /******************* * Interface Panel * *******************/ - START_SPREFS_CAT( Interface, qtr("Interface settings") ); + 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 ); +#if defined( WIN32 ) + CONFIG_GENERIC( "language", StringList, ui.languageLabel, language ); BUTTONACT( ui.assoButton, assoDialog() ); #else ui.language->hide(); @@ -418,19 +466,28 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, char *psz_intf = config_GetPsz( p_intf, "intf" ); if( psz_intf ) { - msg_Dbg( p_intf, "Interface in config file: %s", psz_intf ); if( strstr( psz_intf, "skin" ) ) ui.skins->setChecked( true ); else if( strstr( psz_intf, "qt" ) ) ui.qt4->setChecked( true ); } - delete psz_intf; + free( psz_intf ); optionWidgets.append( ui.skins ); optionWidgets.append( ui.qt4 ); - CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); - CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); + CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel, + displayModeBox ); + CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo ); + CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController ); + CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox ); + CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel, + ui.fileSkin, ui.skinBrowse ); + + CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, + artFetcher ); + + /* UPDATE options */ #ifdef UPDATE_CHECK CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox ); CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL, @@ -441,30 +498,43 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.updatesBox->hide(); ui.updatesDays->hide(); #endif - CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); - CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo ); - CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, - skinBrowse ); -#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) + /* ONE INSTANCE options */ +#if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__) CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, EnqueueOneInterfaceMode ); #else ui.OneInterfaceBox->hide(); #endif + /* RECENTLY PLAYED options */ + CONNECT( ui.saveRecentlyPlayed, toggled( bool ), + ui.recentlyPlayedFilters, setEnabled( bool ) ); + ui.recentlyPlayedFilters->setEnabled( false ); + CONFIG_GENERIC( "qt-recentplay", Bool, NULL, saveRecentlyPlayed ); + CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel, + recentlyPlayedFilters ); + END_SPREFS_CAT; - START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") ); + START_SPREFS_CAT( Subtitles, + qtr("Subtitles & On Screen Display Settings") ); CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); - - CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); - 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 ); - CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect ); + CONFIG_GENERIC( "video-title-show", Bool, NULL, OSDTitleBox); + + + CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel, + encoding ); + CONFIG_GENERIC( "sub-language", String, ui.subLangLabel, + preferredLanguage ); + CONFIG_GENERIC_FILE( "freetype-font", File, ui.fontLabel, ui.font, + ui.fontBrowse ); + CONFIG_GENERIC( "freetype-color", IntegerList, ui.fontColorLabel, + fontColor ); + CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, + ui.fontSizeLabel, fontSize ); + CONFIG_GENERIC( "freetype-effect", IntegerList, ui.fontEffectLabel, + effect ); + CONFIG_GENERIC_NO_BOOL( "sub-margin", Integer, ui.subsPosLabel, subsPosition ); END_SPREFS_CAT; @@ -488,8 +558,20 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, panel_layout->addWidget( panel_label ); panel_layout->addWidget( title_line ); - panel_layout->addWidget( panel ); - if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 ); + + if( small ) + { + QScrollArea *scroller= new QScrollArea; + scroller->setWidget( panel ); + scroller->setWidgetResizable( true ); + scroller->setFrameStyle( QFrame::NoFrame ); + panel_layout->addWidget( scroller ); + } + else + { + panel_layout->addWidget( panel ); + if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 ); + } setLayout( panel_layout ); } @@ -498,16 +580,25 @@ void SPrefsPanel::updateAudioOptions( int number) { QString value = qobject_cast(optionWidgets[audioOutCoB]) ->itemData( number ).toString(); - -#ifndef WIN32 - optionWidgets[ossW]->setVisible( ( value == "oss" ) ); - optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); -#else +#ifdef WIN32 optionWidgets[directxW]->setVisible( ( value == "directx" ) ); +#else + /* optionWidgets[ossW] can be NULL */ + if( optionWidgets[ossW] ) + optionWidgets[ossW]->setVisible( ( value == "oss" ) ); + /* optionWidgets[alsaW] can be NULL */ + if( optionWidgets[alsaW] ) + optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); #endif optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); } + +SPrefsPanel::~SPrefsPanel() +{ + qDeleteAll( controls ); controls.clear(); +} + void SPrefsPanel::updateAudioVolume( int volume ) { qobject_cast(optionWidgets[volLW]) @@ -518,8 +609,6 @@ void SPrefsPanel::updateAudioVolume( int volume ) /* Function called from the main Preferences dialog on each SPrefs Panel */ void SPrefsPanel::apply() { - msg_Dbg( p_intf, "Trying to save the %i simple panel", number ); - /* Generic save for ever panel */ QList::Iterator i; for( i = controls.begin() ; i != controls.end() ; i++ ) @@ -533,7 +622,7 @@ void SPrefsPanel::apply() case SPrefsInputAndCodecs: { /* Device default selection */ - char *psz_devicepath = + const char *psz_devicepath = qtu( qobject_cast(optionWidgets[inputLE] )->text() ); if( !EMPTY_STR( psz_devicepath ) ) { @@ -542,24 +631,6 @@ void SPrefsPanel::apply() config_PutPsz( p_intf, "cd-audio", psz_devicepath ); } - /* Access filters */ -#define saveBox( name, box ) {\ - if( box->isChecked() ) { \ - if( b_first ) { \ - qs_filter.append( name ); \ - b_first = false; \ - } \ - else qs_filter.append( ":" ).append( name ); \ - } } - - bool b_first = true; - qs_filter.clear(); - saveBox( "record", qobject_cast(optionWidgets[recordChB]) ); - saveBox( "dump", qobject_cast(optionWidgets[dumpChB]) ); - saveBox( "timeshift", qobject_cast(optionWidgets[timeshiftChB]) ); - saveBox( "bandwidth", qobject_cast(optionWidgets[bandwidthChB] ) ); - config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) ); - #define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue ) #define CaC( name ) CaCi( name, 1 ) /* Caching */ @@ -567,30 +638,29 @@ void SPrefsPanel::apply() int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt(); if( i_comboValue ) { - msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue ); CaC( "udp-caching" ); - if (module_Exists (p_intf, "dvdread" )) + if (module_exists ("dvdread" )) CaC( "dvdread-caching" ); - if (module_Exists (p_intf, "dvdnav" )) + if (module_exists ("dvdnav" )) CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" ); CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); - CaC( "screen-caching" ); - CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 ); - CaCi( "http-caching", 4 ); - if (module_Exists (p_intf, "access_realrtsp" )) + CaC( "screen-caching" ); Cac( "bd-caching" ); + CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 ); + CaCi( "http-caching", 2 ); + if (module_exists ("access_realrtsp" )) CaCi( "realrtsp-caching", 10 ); - CaCi( "mms-caching", 19 ); + CaCi( "mms-caching", 10 ); #ifdef WIN32 CaC( "dshow-caching" ); #else - if (module_Exists (p_intf, "v4l" )) + if (module_exists ( "v4l" )) CaC( "v4l-caching" ); - if (module_Exists (p_intf, "access_jack" )) + if (module_exists ( "access_jack" )) CaC( "jack-input-caching" ); - if (module_Exists (p_intf, "v4l2" )) + if (module_exists ( "v4l2" )) CaC( "v4l2-caching" ); - if (module_Exists (p_intf, "pvr" )) + if (module_exists ( "pvr" )) CaC( "pvr-caching" ); #endif //CaCi( "dv-caching" ) too short... @@ -604,37 +674,28 @@ void SPrefsPanel::apply() if( qobject_cast(optionWidgets[skinRB])->isChecked() ) config_PutPsz( p_intf, "intf", "skins2" ); if( qobject_cast(optionWidgets[qtRB])->isChecked() ) - config_PutPsz( p_intf, "intf", "qt4" ); + config_PutPsz( p_intf, "intf", "qt" ); break; } case SPrefsAudio: { - bool b_normChecked = + bool b_checked = qobject_cast(optionWidgets[normalizerChB])->isChecked(); - if( qs_filter.isEmpty() ) - { - /* the psz_filter is already empty, so we just append it needed */ - if( b_normChecked ) qs_filter = "volnorm"; - } - else /* Not Empty */ - { - if( qs_filter.contains( "volnorm" ) ) - { - /* The qs_filter not empty and contains "volnorm" - that we have to remove */ - if( !b_normChecked ) - { - /* Ugly :D */ - qs_filter.remove( "volnorm:" ); - qs_filter.remove( ":volnorm" ); - qs_filter.remove( "volnorm" ); - } - } - else /* qs_filter not empty, but doesn't have volnorm inside */ - if( b_normChecked ) qs_filter.append( ":volnorm" ); - } - config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) ); + if( b_checked && !qs_filter.contains( "volnorm" ) ) + qs_filter.append( "volnorm" ); + if( !b_checked && qs_filter.contains( "volnorm" ) ) + qs_filter.removeAll( "volnorm" ); + + b_checked = + qobject_cast(optionWidgets[headphoneB])->isChecked(); + + if( b_checked && !qs_filter.contains( "headphone" ) ) + qs_filter.append( "headphone" ); + if( !b_checked && qs_filter.contains( "headphone" ) ) + qs_filter.removeAll( "headphone" ); + + config_PutPsz( p_intf, "audio-filter", qtu( qs_filter.join( ":" ) ) ); break; } } @@ -709,8 +770,8 @@ void SPrefsPanel::assoDialog() aTa( ".a52" ); aTa( ".aac" ); aTa( ".ac3" ); aTa( ".dts" ); aTa( ".flac" ); aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" ); - aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".ogg" ); aTa( ".spx" ); aTa( ".wav" ); - aTa( ".wma" ); aTa( ".xm" ); + aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".oga" ); aTa( ".spx" ); + aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" ); audioType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? Qt::Checked : Qt::PartiallyChecked ) @@ -718,10 +779,11 @@ void SPrefsPanel::assoDialog() i_temp = 0; aTv( ".asf" ); aTv( ".avi" ); aTv( ".divx" ); aTv( ".dv" ); aTv( ".flv" ); - aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m4v" ); aTv( ".mkv" ); - aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); + aTv( ".gxf" ); aTv( ".m1v" ); aTv( ".m2v" ); aTv( ".m2ts" ); aTv( ".m4v" ); + aTv( ".mkv" ); aTv( ".mov" ); aTv( ".mp2" ); aTv( ".mp4" ); aTv( ".mpeg" ); aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); - aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" ); + aTv( ".mts" ); aTv( ".mxf" ); + aTv( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" ); aTv( ".vob" ); aTv( ".wmv" ); videoType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? @@ -753,7 +815,7 @@ void SPrefsPanel::assoDialog() listAsso.clear(); } -void addAsso( QVLCRegistry *qvReg, char *psz_ext ) +void addAsso( QVLCRegistry *qvReg, const char *psz_ext ) { std::string s_path( "VLC" ); s_path += psz_ext; std::string s_path2 = s_path; @@ -792,7 +854,7 @@ void addAsso( QVLCRegistry *qvReg, char *psz_ext ) } } -void delAsso( QVLCRegistry *qvReg, char *psz_ext ) +void delAsso( QVLCRegistry *qvReg, const char *psz_ext ) { char psz_VLC[] = "VLC"; char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" );