X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=9ab4e5e2365240608167b9a5c59cb524f8a33276;hb=548d89d193d0ffd1a4141a781c8fee5f39139841;hp=21f63e6f513273e3d005ae0a956506a5867dc06e;hpb=43d9cf9de77efd77b5cbc8e1432a4d0a2097f445;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 21f63e6f51..9ab4e5e236 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -40,12 +40,16 @@ #include #include +#include +#include #include -#include - #define ICON_HEIGHT 64 +#ifdef WIN32 +# include +#endif + /********************************************************************* * The List of categories *********************************************************************/ @@ -63,7 +67,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma #define ADD_CATEGORY( button, label, icon, numb ) \ QToolButton * button = new QToolButton( this ); \ - button->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \ + button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \ button->setText( label ); \ button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \ button->setIconSize( QSize( icon_height, icon_height ) ); \ @@ -75,14 +79,17 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma 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 ); + cone_interface_64, 0 ); + ADD_CATEGORY( SPrefsAudio, qtr("Audio"), + cone_audio_64, 1 ); + ADD_CATEGORY( SPrefsVideo, qtr("Video"), + cone_video_64, 2 ); ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"), - spref_cone_Subtitles_64.png, 3 ); + cone_subtitles_64, 3 ); ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"), - spref_cone_Input_64.png, 4 ); - ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 ); + cone_input_64, 4 ); + ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), + cone_hotkeys_64, 5 ); #undef ADD_CATEGORY @@ -117,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 ); \ } @@ -138,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: \ @@ -183,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 ); @@ -219,7 +247,10 @@ 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 ) ); #define audioCommon( name ) \ QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \ @@ -227,7 +258,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, name ## Layout->setMargin( 0 ); \ name ## Layout->setSpacing( 0 ); \ QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \ - name ## Label->setMinimumSize(QSize(100, 0)); \ + name ## Label->setMinimumSize(QSize(250, 0)); \ name ## Layout->addWidget( name ## Label ); \ #define audioControl( name) \ @@ -246,26 +277,20 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, name ## Layout->addWidget( name ## Browse ); \ outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 ); - /* hide if necessary */ - 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 ); + 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 @@ -289,13 +314,17 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, defaultVolume ); CONNECT( ui.defaultVolume, valueChanged( int ), - this, updateAudioVolume( int ) ); + this, updateAudioVolume( int ) ); + + CONFIG_BOOL( "qt-autosave-volume", keepVolumeRadio ); + ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() ); + CONNECT( ui.resetVolumeRadio, toggled( bool ), + ui.defaultVolume_zone, setEnabled( bool ) ); CONFIG_GENERIC( "audio-language" , String , ui.langLabel, preferredAudioLanguage ); - CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox ); - CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox ); + CONFIG_BOOL( "spdif", spdifBox ); CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel, detectionDolby ); @@ -305,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 ); @@ -323,6 +353,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); optionWidgets.append( ui.volumeValue ); optionWidgets.append( ui.headphoneEffect ); + optionWidgets.append( ui.spdifBox ); updateAudioOptions( ui.outputModule->currentIndex() ); /* LastFM */ @@ -337,11 +368,19 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.lastfm->setChecked( true ); else ui.lastfm->setChecked( false ); + + ui.lastfm_zone->setVisible( ui.lastfm->isChecked() ); + + CONNECT( ui.lastfm, toggled( bool ), + ui.lastfm_zone, setVisible( bool ) ); CONNECT( ui.lastfm, stateChanged( int ), this, lastfm_Changed( int ) ); } else + { ui.lastfm->hide(); + ui.lastfm_zone->hide(); + } /* Normalizer */ CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, @@ -386,6 +425,10 @@ 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 ); CONFIG_GENERIC_NO_BOOL( "server-port", Integer, ui.portLabel, UDPPort ); @@ -393,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 ); @@ -446,12 +499,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, if (module_exists ("pvr")) TestCaC( "pvr-caching" ); #endif - TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); - TestCaCi( "http-caching", 4 ); + if (module_exists ("livedotcom")) + TestCaCi( "rtsp-caching", 4 ); + TestCaCi( "ftp-caching", 2 ); + 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 @@ -461,7 +517,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, * Interface Panel * *******************/ START_SPREFS_CAT( Interface, qtr("Interface Settings") ); - ui.defaultLabel->setFont( italicFont ); +// ui.defaultLabel->setFont( italicFont ); ui.skinsLabel->setText( qtr( "This is VLC's skinnable interface. You can download other skins at" ) + QString( " VLC skins website." ) ); @@ -471,43 +527,66 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "language", StringList, ui.languageLabel, language ); BUTTONACT( ui.assoButton, assoDialog() ); #else - ui.language->hide(); - ui.languageLabel->hide(); - ui.assoName->hide(); - ui.assoButton->hide(); + ui.languageBox->hide(); + ui.assoBox->hide(); #endif - /* interface */ char *psz_intf = config_GetPsz( p_intf, "intf" ); if( psz_intf ) { if( strstr( psz_intf, "skin" ) ) ui.skins->setChecked( true ); - else if( strstr( psz_intf, "qt" ) ) - ui.qt4->setChecked( true ); + } else { + /* defaults to qt */ + ui.qt4->setChecked( true ); } free( psz_intf ); 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() ) ); + ui.stylesCombo->insertSeparator( 1 ); + + CONNECT( ui.stylesCombo, currentIndexChanged( QString ), this, changeStyle( QString ) ); + optionWidgets.append( ui.stylesCombo ); +#else + 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_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() ); CONNECT( ui.updatesBox, toggled( bool ), ui.updatesDays, setEnabled( bool ) ); #else @@ -516,9 +595,12 @@ 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 ), + ui.EnqueueOneInterfaceMode, setEnabled( bool ) ); #else ui.OneInterfaceBox->hide(); #endif @@ -526,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 ); @@ -534,16 +616,15 @@ 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, encoding ); CONFIG_GENERIC( "sub-language", String, ui.subLangLabel, preferredLanguage ); - CONFIG_GENERIC_FILE( "freetype-font", File, ui.fontLabel, ui.font, - ui.fontBrowse ); + CONFIG_GENERIC_NO_BOOL( "freetype-font", Font, ui.fontLabel, font ); CONFIG_GENERIC( "freetype-color", IntegerList, ui.fontColorLabel, fontColor ); CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, @@ -556,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 ); @@ -607,16 +688,18 @@ 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 } + 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] ) @@ -626,6 +709,8 @@ void SPrefsPanel::updateAudioOptions( int number) optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); #endif optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); + optionWidgets[spdifChB]->setVisible( ( value == "alsa" || value == "oss" || value == "auhal" || + value == "aout_directx" || value == "waveout" ) ); } @@ -657,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 ) @@ -712,6 +798,10 @@ void SPrefsPanel::apply() config_PutPsz( p_intf, "intf", "skins2" ); if( qobject_cast(optionWidgets[qtRB])->isChecked() ) config_PutPsz( p_intf, "intf", "qt" ); + if( qobject_cast(optionWidgets[styleCB]) ) + getSettings()->setValue( "MainWindow/QtStyle", + qobject_cast(optionWidgets[styleCB])->currentText() ); + break; } @@ -749,10 +839,24 @@ void SPrefsPanel::lastfm_Changed( int i_state ) config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ); } +void SPrefsPanel::changeStyle( QString s_style ) +{ + QApplication::setStyle( s_style ); + + /* force refresh on all widgets */ + QWidgetList widgets = QApplication::allWidgets(); + QWidgetList::iterator it = widgets.begin(); + while( it != widgets.end() ) { + (*it)->update(); + it++; + }; +} + #ifdef WIN32 #include #include #include "util/registry.hpp" +#include bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current, QTreeWidgetItem* parent, QVLCRegistry *qvReg ) @@ -777,6 +881,23 @@ bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current, void SPrefsPanel::assoDialog() { + 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 ); @@ -808,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 ) @@ -821,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 )