X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=5c2490d7aa6460ff5b660e81d080d8747057b87b;hb=2f8eed3529a8e39b632fc2a2b5fb552529762692;hp=e8542daa5ee45b0c2edd675ae7f3a485565dfdb5;hpb=a3f105db642798bc391b7e5f03620326ad1f1d41;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index e8542daa5e..5c2490d7aa 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -49,6 +49,7 @@ #ifdef WIN32 # include #endif +#include /********************************************************************* * The List of categories @@ -124,15 +125,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 +166,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: \ @@ -171,9 +192,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, // Title Label QLabel *panel_label = new QLabel; - QFont labelFont = QApplication::font( static_cast(0) ); + QFont labelFont = QApplication::font(); labelFont.setPointSize( labelFont.pointSize() + 6 ); - labelFont.setFamily( "Verdana" ); panel_label->setFont( labelFont ); // Title
@@ -181,7 +201,7 @@ 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) ); + QFont italicFont = QApplication::font(); italicFont.setItalic( true ); switch( number ) @@ -190,20 +210,19 @@ 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_GENERIC( "vout", Module, ui.voutLabel, outputModule ); - CONFIG_GENERIC( "video-wallpaper" , Bool , NULL, wallpaperMode ); + CONFIG_BOOL( "video-wallpaper", wallpaperMode ); #ifdef WIN32 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 ); @@ -216,7 +235,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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 ); @@ -227,7 +246,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 ) ); @@ -262,15 +281,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #ifdef WIN32 audioControl( DirectX ); optionWidgets.append( DirectXControl ); - CONFIG_GENERIC2( "directx-audio-device-name", StringList, - 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 @@ -291,12 +310,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #undef audioCommon /* Audio Options */ - CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, + ui.volumeValue->setMaximum( QT_VOLUME_MAX / QT_VOLUME_DEFAULT * 100 ); + CONFIG_GENERIC_NO_BOOL( "qt-startvolume" , IntegerRangeSlider, NULL, defaultVolume ); 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 ) ); @@ -304,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 ); @@ -314,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 ); @@ -417,7 +438,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair ); /* live555 module prefs */ - CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, + CONFIG_BOOL( "rtsp-tcp", live555TransportRTSP_TCPRadio ); if ( !module_exists( "live555" ) ) { @@ -425,15 +446,25 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.live555TransportHTTPRadio->hide(); ui.live555TransportLabel->hide(); } + CONFIG_BOOL( "ffmpeg-hw", hwAccelBox ); #ifdef WIN32 - CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); + CONFIG_BOOL( "prefer-system-codecs", systemCodecBox ); + HINSTANCE hdxva2_dll = LoadLibrary(TEXT("DXVA2.DLL") ); + if( !hdxva2_dll ) + ui.hwAccelBox->setEnabled( false ); + else + FreeLibrary( hdxva2_dll ); #else ui.systemCodecBox->hide(); #endif - CONFIG_GENERIC( "ffmpeg-hw", Bool, NULL, hwAccelBox ); optionWidgets.append( ui.DVDDevice ); optionWidgets.append( ui.cachingCombo ); CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox ); + CONFIG_BOOL( "skip-frames", skipFrames ); + CONFIG_GENERIC( "sout-x264-tune", StringList, ui.x264Label, tuneBox ); + CONFIG_GENERIC( "sout-x264-preset", StringList, ui.x264Label, presetBox ); + CONFIG_GENERIC( "sout-x264-profile", StringList, ui.x264profileLabel, profileBox ); + CONFIG_GENERIC( "sout-x264-level", String, ui.x264profileLabel, levelBox ); /* Caching */ /* Add the things to the ComboBox */ @@ -464,7 +495,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, if (module_exists ("dvdnav")) TestCaC( "dvdnav-caching" ); TestCaC( "tcp-caching" ); - TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); + TestCaC( "cdda-caching" ); TestCaC( "screen-caching" ); TestCaC( "vcd-caching" ); #ifdef WIN32 TestCaC( "dshow-caching" ); @@ -499,7 +530,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, // ui.defaultLabel->setFont( italicFont ); ui.skinsLabel->setText( qtr( "This is VLC's skinnable interface. You can download other skins at" ) - + QString( " VLC skins website." ) ); + + QString( " " ) + + qtr( "VLC skins website" )+ QString( "." ) ); ui.skinsLabel->setFont( italicFont ); #if defined( WIN32 ) @@ -507,7 +539,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, BUTTONACT( ui.assoButton, assoDialog() ); #else ui.languageBox->hide(); - ui.assoBox->hide(); + ui.assoButton->hide(); + ui.assocLabel->hide(); #endif /* interface */ char *psz_intf = config_GetPsz( p_intf, "intf" ); @@ -536,46 +569,46 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.stylesCombo->hide(); optionWidgets.append( NULL ); #endif - - ui.skins_zone->setEnabled( ui.skins->isChecked() ); - CONNECT( ui.skins, toggled( bool ), ui.skins_zone, setEnabled( bool ) ); - - ui.native_zone->setEnabled( ui.qt4->isChecked() ); - CONNECT( ui.qt4, toggled( bool ), ui.native_zone, setEnabled( bool ) ); - - CONNECT( ui.displayModeBox, currentIndexChanged( 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_GENERIC( "qt-notification", Bool, NULL, sysPop ); + radioGroup = new QButtonGroup(this); + radioGroup->addButton( ui.qt4, 0 ); + radioGroup->addButton( ui.skins, 1 ); + CONNECT( radioGroup, buttonClicked( int ), + ui.styleStackedWidget, setCurrentIndex( int ) ); + ui.styleStackedWidget->setCurrentIndex( radioGroup->checkedId() ); + + CONNECT( ui.minimalviewBox, toggled( bool ), + ui.mainPreview, setNormalPreview( bool ) ); + CONFIG_BOOL( "qt-minimal-view", minimalviewBox ); + ui.mainPreview->setNormalPreview( ui.minimalviewBox->isChecked() ); + ui.skinsPreview->setPreview( InterfacePreviewWidget::SKINS ); + + CONFIG_BOOL( "embedded-video", embedVideo ); + CONFIG_BOOL( "qt-fs-controller", fsController ); + CONFIG_BOOL( "qt-system-tray", systrayBox ); + CONFIG_BOOL( "qt-notification", sysPop ); + CONFIG_BOOL( "playlist-tree", treePlaylist ); 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() ); CONNECT( ui.updatesBox, toggled( bool ), ui.updatesDays, setEnabled( bool ) ); #else - ui.updatesBox->hide(); - ui.updatesDays->hide(); + ui.updateNotifierZone->hide(); #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 ), @@ -587,7 +620,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 ); @@ -595,8 +628,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, @@ -616,7 +649,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 ); @@ -637,7 +670,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, p_config = config_FindConfig( VLC_OBJECT(p_intf), "hotkeys-mousewheel-mode" ); control = new IntegerListConfigControl( VLC_OBJECT(p_intf), - p_config, false, this, gLayout, line ); + p_config, this, false, gLayout, line ); controls.append( control ); break; @@ -667,8 +700,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 } @@ -700,7 +734,7 @@ SPrefsPanel::~SPrefsPanel() void SPrefsPanel::updateAudioVolume( int volume ) { qobject_cast(optionWidgets[volLW]) - ->setValue( volume * 100 / 256 ); + ->setValue( volume * 100 / QT_VOLUME_DEFAULT ); } @@ -743,7 +777,7 @@ void SPrefsPanel::apply() if (module_exists ("dvdnav" )) CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" ); - CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); + CaC( "cdda-caching" ); CaC( "file-caching" ); CaC( "screen-caching" ); CaC( "bd-caching" ); CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 ); CaCi( "http-caching", 2 ); @@ -859,28 +893,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 ); @@ -925,7 +954,7 @@ 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 )