X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=9ab4e5e2365240608167b9a5c59cb524f8a33276;hb=548d89d193d0ffd1a4141a781c8fee5f39139841;hp=076bd69d4ba354ce9e2f4d175f02cfbae37b9aa4;hpb=7d45ebdb61b94784664c82deb2dc63cf07eca85a;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 076bd69d4b..9ab4e5e236 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -47,7 +47,7 @@ #define ICON_HEIGHT 64 #ifdef WIN32 -# include "vistaassoc.h" +# include #endif /********************************************************************* @@ -124,15 +124,35 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, control = new type ## ConfigControl( VLC_OBJECT(p_intf), \ p_config, label, ui.qcontrol, false ); \ controls.append( control ); \ + } \ + else { \ + ui.qcontrol->setEnabled( false ); \ + if( label ) label->setEnabled( false ); \ } -#define CONFIG_GENERIC2( option, type, label, qcontrol ) \ +#define CONFIG_BOOL( option, qcontrol ) \ + p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ + if( p_config ) \ + { \ + control = new BoolConfigControl( VLC_OBJECT(p_intf), \ + p_config, NULL, ui.qcontrol, false ); \ + controls.append( control ); \ + } \ + else { ui.qcontrol->setEnabled( false ); } + + +#define CONFIG_GENERIC_NO_UI( 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 ); \ + p_config, label, qcontrol, false ); \ controls.append( control ); \ + } \ + else { \ + QWidget *widget = label; \ + qcontrol->setVisible( false ); \ + if( widget ) widget->setEnabled( false ); \ } @@ -145,14 +165,14 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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, qcontrol, qbutton ); \ - 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, qcontrol, qbutton ); \ + controls.append( control ); \ + } #define START_SPREFS_CAT( name , label ) \ case SPrefs ## name: \ @@ -190,32 +210,33 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, * VIDEO Panel Implementation * ******************************/ START_SPREFS_CAT( Video , qtr("Video Settings") ); - CONFIG_GENERIC( "video", Bool, NULL, enableVideo ); + CONFIG_BOOL( "video", 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_BOOL( "fullscreen", fullscreen ); + CONFIG_BOOL( "overlay", overlay ); + CONFIG_BOOL( "video-on-top", alwaysOnTop ); + CONFIG_BOOL( "video-deco", windowDecorations ); + CONFIG_BOOL( "skip-frames", skipFrames ); CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule ); + CONFIG_BOOL( "video-wallpaper", wallpaperMode ); #ifdef WIN32 - CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel, dXdisplayDevice ); - CONFIG_GENERIC( "directx-hw-yuv", Bool, NULL, hwYUVBox ); + CONFIG_BOOL( "directx-hw-yuv", hwYUVBox ); #else ui.directXBox->setVisible( false ); ui.hwYUVBox->setVisible( false ); #endif - CONFIG_GENERIC( "deinterlace-mode", StringList, ui.deinterLabel, deinterlaceBox ); + CONFIG_GENERIC( "deinterlace", IntegerList, ui.deinterLabel, deinterlaceBox ); + CONFIG_GENERIC( "deinterlace-mode", StringList, ui.deinterModeLabel, deinterlaceModeBox ); 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, + CONFIG_BOOL( "snapshot-sequential", snapshotsSequentialNumbering ); CONFIG_GENERIC( "snapshot-format", StringList, ui.arLabel, snapshotsFormat ); @@ -226,7 +247,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ******************************/ START_SPREFS_CAT( Audio, qtr("Audio Settings") ); - CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); + CONFIG_BOOL( "audio", enableAudio ); ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() ); CONNECT( ui.enableAudio, toggled( bool ), ui.SPrefsAudio_zone, setEnabled( bool ) ); @@ -261,15 +282,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #ifdef WIN32 audioControl( DirectX ); optionWidgets.append( DirectXControl ); - CONFIG_GENERIC2( "directx-audio-device", IntegerList, - NULL, DirectXDevice ); + CONFIG_GENERIC_NO_UI( "directx-audio-device-name", StringList, + DirectXLabel, DirectXDevice ); #else if( module_exists( "alsa" ) ) { audioControl( alsa ); optionWidgets.append( alsaControl ); - CONFIG_GENERIC2( "alsa-audio-device" , StringList, NULL, + CONFIG_GENERIC_NO_UI( "alsa-audio-device" , StringList, alsaLabel, alsaDevice ); } else @@ -295,7 +316,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.defaultVolume, valueChanged( int ), this, updateAudioVolume( int ) ); - CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, keepVolumeRadio ); + CONFIG_BOOL( "qt-autosave-volume", keepVolumeRadio ); ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() ); CONNECT( ui.resetVolumeRadio, toggled( bool ), ui.defaultVolume_zone, setEnabled( bool ) ); @@ -303,7 +324,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "audio-language" , String , ui.langLabel, preferredAudioLanguage ); - CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox ); + CONFIG_BOOL( "spdif", spdifBox ); CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel, detectionDolby ); @@ -313,6 +334,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, replayCombo ); CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel, visualisation); + CONFIG_BOOL( "audio-time-stretch", autoscaleBox ); /* Audio Output Specifics */ CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule ); @@ -403,6 +425,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, free( psz_dvddiscpath ); free( psz_vcddiscpath ); } + CONFIG_GENERIC_FILE( "dvd", File, ui.DVDLabel, + ui.DVDDevice, ui.DVDBrowse ); CONFIG_GENERIC_FILE( "input-record-path", Directory, ui.recordLabel, ui.recordPath, ui.recordBrowse ); @@ -412,12 +436,22 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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 ); + + /* live555 module prefs */ + CONFIG_BOOL( "rtsp-tcp", + live555TransportRTSP_TCPRadio ); + if ( !module_exists( "live555" ) ) + { + ui.live555TransportRTSP_TCPRadio->hide(); + ui.live555TransportHTTPRadio->hide(); + ui.live555TransportLabel->hide(); + } #ifdef WIN32 - CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); + CONFIG_BOOL( "prefer-system-codecs", systemCodecBox ); #else ui.systemCodecBox->hide(); #endif + CONFIG_BOOL( "ffmpeg-hw", hwAccelBox ); optionWidgets.append( ui.DVDDevice ); optionWidgets.append( ui.cachingCombo ); CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox ); @@ -468,11 +502,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, if (module_exists ("livedotcom")) TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); - TestCaCi( "http-caching", 4 ); + TestCaCi( "http-caching", 2 ); if (module_exists ("access_realrtsp")) TestCaCi( "realrtsp-caching", 10 ); - TestCaCi( "mms-caching", 19 ); - if( b_cache_equal ) ui.cachingCombo->setCurrentIndex( + TestCaCi( "mms-caching", 10 ); + if( b_cache_equal == 1 ) + ui.cachingCombo->setCurrentIndex( ui.cachingCombo->findData( QVariant( i_cache ) ) ); #undef TestCaCi #undef TestCaC @@ -510,6 +545,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.skins ); optionWidgets.append( ui.qt4 ); #if !defined(NDEBUG) || !defined( WIN32) + ui.stylesCombo->addItem( qtr("System's default") ); ui.stylesCombo->addItems( QStyleFactory::keys() ); ui.stylesCombo->setCurrentIndex( ui.stylesCombo->findText( getSettings()->value( "MainWindow/QtStyle", "" ).toString() ) ); @@ -518,7 +554,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.stylesCombo, currentIndexChanged( QString ), this, changeStyle( QString ) ); optionWidgets.append( ui.stylesCombo ); #else - ui.styleCombo->hide(); + ui.stylesCombo->hide(); + optionWidgets.append( NULL ); #endif ui.skins_zone->setEnabled( ui.skins->isChecked() ); @@ -527,27 +564,26 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.native_zone->setEnabled( ui.qt4->isChecked() ); CONNECT( ui.qt4, toggled( bool ), ui.native_zone, setEnabled( bool ) ); - InterfacePreviewWidget *preview = new InterfacePreviewWidget( this ); - ( (QGridLayout *) ui.LooknfeelBox->layout() )-> - addWidget( preview, 1, 0, 1, 2 ); CONNECT( ui.displayModeBox, currentIndexChanged( int ), - preview, setPreview( int ) ); + ui.mainPreview, setPreview( int ) ); + ui.skinsPreview->setPreview( 3 ); /* skins_preview resource index */ 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_BOOL( "embedded-video", embedVideo ); + CONFIG_BOOL( "qt-fs-controller", fsController ); + CONFIG_BOOL( "qt-system-tray", systrayBox ); + CONFIG_BOOL( "qt-notification", sysPop ); CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel, ui.fileSkin, ui.skinBrowse ); - CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox ); + CONFIG_BOOL( "qt-video-autoresize", resizingBox ); CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); /* UPDATE options */ #ifdef UPDATE_CHECK - CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox ); + CONFIG_BOOL( "qt-updates-notif", updatesBox ); CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL, updatesDays ); ui.updatesDays->setEnabled( ui.updatesBox->isChecked() ); @@ -559,8 +595,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #endif /* ONE INSTANCE options */ #if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__) - CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); - CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, + CONFIG_BOOL( "one-instance", OneInterfaceMode ); + CONFIG_BOOL( "playlist-enqueue", EnqueueOneInterfaceMode ); ui.EnqueueOneInterfaceMode->setEnabled( ui.OneInterfaceMode->isChecked() ); CONNECT( ui.OneInterfaceMode, toggled( bool ), @@ -572,7 +608,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.saveRecentlyPlayed, toggled( bool ), ui.recentlyPlayedFilters, setEnabled( bool ) ); ui.recentlyPlayedFilters->setEnabled( false ); - CONFIG_GENERIC( "qt-recentplay", Bool, NULL, saveRecentlyPlayed ); + CONFIG_BOOL( "qt-recentplay", saveRecentlyPlayed ); CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel, recentlyPlayedFilters ); @@ -580,8 +616,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, START_SPREFS_CAT( Subtitles, qtr("Subtitles & On Screen Display Settings") ); - CONFIG_GENERIC( "osd", Bool, NULL, OSDBox); - CONFIG_GENERIC( "video-title-show", Bool, NULL, OSDTitleBox); + CONFIG_BOOL( "osd", OSDBox); + CONFIG_BOOL( "video-title-show", OSDTitleBox); CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel, @@ -601,7 +637,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, case SPrefsHotkeys: { - p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-fullscreen" ); + p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-play" ); QGridLayout *gLayout = new QGridLayout; panel->setLayout( gLayout ); @@ -652,8 +688,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #undef START_SPREFS_CAT #undef CONFIG_GENERIC_FILE #undef CONFIG_GENERIC_NO_BOOL -#undef CONFIG_GENERIC2 +#undef CONFIG_GENERIC_NO_UI #undef CONFIG_GENERIC +#undef CONFIG_BOOL } @@ -662,7 +699,7 @@ void SPrefsPanel::updateAudioOptions( int number) QString value = qobject_cast(optionWidgets[audioOutCoB]) ->itemData( number ).toString(); #ifdef WIN32 - optionWidgets[directxW]->setVisible( ( value == "directx" ) ); + optionWidgets[directxW]->setVisible( ( value == "aout_directx" ) ); #else /* optionWidgets[ossW] can be NULL */ if( optionWidgets[ossW] ) @@ -672,8 +709,8 @@ void SPrefsPanel::updateAudioOptions( int number) optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); #endif optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); - optionWidgets[spdifChB]->setVisible( ( value != "aout_file" - && value != "dummy" ) ); + optionWidgets[spdifChB]->setVisible( ( value == "alsa" || value == "oss" || value == "auhal" || + value == "aout_directx" || value == "waveout" ) ); } @@ -705,13 +742,14 @@ void SPrefsPanel::apply() case SPrefsInputAndCodecs: { /* Device default selection */ - const char *psz_devicepath = - qtu( qobject_cast(optionWidgets[inputLE] )->text() ); + char *psz_devicepath = + strdup( qtu( qobject_cast(optionWidgets[inputLE] )->text() ) ); if( !EMPTY_STR( psz_devicepath ) ) { config_PutPsz( p_intf, "dvd", psz_devicepath ); config_PutPsz( p_intf, "vcd", psz_devicepath ); config_PutPsz( p_intf, "cd-audio", psz_devicepath ); + free( psz_devicepath ); } #define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue ) @@ -760,8 +798,9 @@ void SPrefsPanel::apply() config_PutPsz( p_intf, "intf", "skins2" ); if( qobject_cast(optionWidgets[qtRB])->isChecked() ) config_PutPsz( p_intf, "intf", "qt" ); - getSettings()->setValue( "MainWindow/QtStyle", - qobject_cast(optionWidgets[styleCB])->currentText() ); + if( qobject_cast(optionWidgets[styleCB]) ) + getSettings()->setValue( "MainWindow/QtStyle", + qobject_cast(optionWidgets[styleCB])->currentText() ); break; } @@ -842,28 +881,23 @@ bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current, void SPrefsPanel::assoDialog() { - OSVERSIONINFO winVer; - winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - //Vista specific file associations - if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 ) - { - LPAPPASSOCREGUI p_appassoc; - CoInitialize( 0 ); - - if( S_OK == CoCreateInstance( &clsid_IApplication2, - NULL, CLSCTX_INPROC_SERVER, - &IID_IApplicationAssociationRegistrationUI, - (void **)&p_appassoc) ) - { - if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) ) - { - CoUninitialize(); - return; - } - } + LPAPPASSOCREGUI p_appassoc; + CoInitialize( 0 ); + if( S_OK == CoCreateInstance( &clsid_IApplication2, + NULL, CLSCTX_INPROC_SERVER, + &IID_IApplicationAssociationRegistrationUI, + (void **)&p_appassoc) ) + { + if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) ) + { CoUninitialize(); + return; + } } + + CoUninitialize(); + QDialog *d = new QDialog( this ); QGridLayout *assoLayout = new QGridLayout( d ); @@ -895,7 +929,7 @@ 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( ".oma" ); aTa( ".oga" ); aTa( ".spx" ); - aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" ); + aTa( ".tta" ); aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" ); audioType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? Qt::Checked : Qt::PartiallyChecked ) @@ -908,15 +942,15 @@ void SPrefsPanel::assoDialog() aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); aTv( ".mts" ); aTv( ".mxf" ); aTv( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" ); - aTv( ".vob" ); aTv( ".wmv" ); + aTv( ".vob" ); aTv( ".vro" ); aTv( ".wmv" ); videoType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? Qt::Checked : Qt::PartiallyChecked ) : Qt::Unchecked ); i_temp = 0; - aTo( ".asx" ); aTo( ".b4s" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" ); - aTo( ".xspf" ); + aTo( ".asx" ); aTo( ".b4s" ); aTo( ".ifo" ); aTo( ".m3u" ); aTo( ".pls" ); + aTo( ".sdp" ); aTo( ".vlc" ); aTo( ".xspf" ); otherType->setCheckState( 0, ( i_temp > 0 ) ? ( ( i_temp == audioType->childCount() ) ? Qt::Checked : Qt::PartiallyChecked )