X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=f54b433b6a8ac934f06ca941a4620a25a17b41b3;hb=2e3ce1ccaab119d84ff531041e684fba4c31cea1;hp=c390736fb9ed82884aa292820c8e954d645bc7d3;hpb=acb13ce893b65001b8291f0a9d5deace31dee33f;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index c390736fb9..f54b433b6a 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * simple_preferences.cpp : "Simple preferences" **************************************************************************** - * Copyright (C) 2006-2008 the VideoLAN team + * Copyright (C) 2006-2010 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -40,15 +40,17 @@ #include #include +#include +#include #include - -#include +#include #define ICON_HEIGHT 64 #ifdef WIN32 -#include "vistaassoc.h" +# include #endif +#include /********************************************************************* * The List of categories @@ -124,15 +126,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 +167,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 +193,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 +202,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,32 +211,32 @@ 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_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 @@ -290,12 +311,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 ) ); @@ -303,7 +325,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 +335,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 ); @@ -347,10 +370,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, else ui.lastfm->setChecked( false ); - ui.lastfm_zone->setEnabled( ui.lastfm->isChecked() ); + ui.lastfm_zone->setVisible( ui.lastfm->isChecked() ); CONNECT( ui.lastfm, toggled( bool ), - ui.lastfm_zone, setEnabled( bool ) ); + ui.lastfm_zone, setVisible( bool ) ); CONNECT( ui.lastfm, stateChanged( int ), this, lastfm_Changed( int ) ); } @@ -385,7 +408,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /* Disk Devices */ { - ui.DVDDevice->setToolTip( + ui.DVDDeviceComboBox->setToolTip( 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" @@ -397,30 +420,58 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) && !strcmp( psz_dvddiscpath, psz_vcddiscpath ) ) { - ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); + ui.DVDDeviceComboBox->setEditText( qfu( psz_dvddiscpath ) ); } free( psz_cddadiscpath ); free( psz_dvddiscpath ); free( psz_vcddiscpath ); } +#ifndef WIN32 + QStringList DVDDeviceComboBoxStringList = QStringList(); + DVDDeviceComboBoxStringList + << "dvd*" << "scd*" << "sr*" << "sg*" << "cd*"; + ui.DVDDeviceComboBox->addItems( QDir( "/dev/" ) + .entryList( DVDDeviceComboBoxStringList, QDir::System ) + .replaceInStrings( QRegExp("^"), "/dev/" ) + ); +#endif + CONFIG_GENERIC( "dvd", String, ui.DVDLabel, + DVDDeviceComboBox->lineEdit() ); CONFIG_GENERIC_FILE( "input-record-path", Directory, ui.recordLabel, ui.recordPath, ui.recordBrowse ); - 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, + CONFIG_GENERIC_NO_BOOL( "postproc-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(); + } + 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 - optionWidgets.append( ui.DVDDevice ); + optionWidgets.append( ui.DVDDeviceComboBox ); optionWidgets.append( ui.cachingCombo ); CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox ); + 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 */ @@ -451,13 +502,11 @@ 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" ); #else - if (module_exists ("v4l")) - TestCaC( "v4l-caching" ); if (module_exists ("access_jack")) TestCaC( "jack-input-caching" ); if (module_exists ("v4l2")) @@ -468,11 +517,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 @@ -482,10 +532,11 @@ 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." ) ); + + QString( " " ) + + qtr( "VLC skins website" )+ QString( "." ) ); ui.skinsLabel->setFont( italicFont ); #if defined( WIN32 ) @@ -493,9 +544,9 @@ 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" ); if( psz_intf ) @@ -510,47 +561,67 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.skins ); optionWidgets.append( ui.qt4 ); - - 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 ) ); - - InterfacePreviewWidget *preview = new InterfacePreviewWidget( this ); - ( (QGridLayout *) ui.LooknfeelBox->layout() )-> - addWidget( preview, 1, 0, 1, 2 ); - CONNECT( ui.displayModeBox, currentIndexChanged( int ), - preview, setPreview( int ) ); - - 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 ); +#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 + 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-video-autoresize", resizingBox ); + CONNECT( ui.embedVideo, toggled( bool ), ui.resizingBox, setEnabled( bool ) ); + ui.resizingBox->setEnabled( ui.embedVideo->isChecked() ); + + CONFIG_BOOL( "qt-fs-controller", fsController ); + CONFIG_BOOL( "qt-system-tray", systrayBox ); + CONFIG_BOOL( "qt-notification", sysPop ); + CONNECT( ui.systrayBox, toggled( bool ), ui.sysPop, setEnabled( bool ) ); + ui.sysPop->setEnabled( ui.systrayBox->isChecked() ); + + CONFIG_BOOL( "qt-pause-minimized", pauseMinimizedBox ); + CONFIG_BOOL( "playlist-tree", treePlaylist ); + CONFIG_BOOL( "play-and-pause", playPauseBox ); CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel, ui.fileSkin, ui.skinBrowse ); - CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, 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 ), @@ -562,7 +633,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 ); @@ -570,9 +641,10 @@ 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( "video-title-position", IntegerList, + ui.OSDTitlePosLabel, OSDTitlePos ); CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel, encoding ); @@ -591,7 +663,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 ); @@ -612,9 +684,17 @@ 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 ); +#ifdef WIN32 + line++; + + p_config = config_FindConfig( VLC_OBJECT(p_intf), "qt-disable-volume-keys" ); + control = new BoolConfigControl( VLC_OBJECT(p_intf), p_config, this, gLayout, line ); + controls.append( control ); +#endif + break; } } @@ -642,8 +722,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 } @@ -652,7 +733,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] ) @@ -662,8 +743,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" ) ); } @@ -675,7 +756,7 @@ SPrefsPanel::~SPrefsPanel() void SPrefsPanel::updateAudioVolume( int volume ) { qobject_cast(optionWidgets[volLW]) - ->setValue( volume * 100 / 256 ); + ->setValue( volume * 100 / QT_VOLUME_DEFAULT ); } @@ -684,7 +765,7 @@ void SPrefsPanel::apply() { /* Generic save for ever panel */ QList::Iterator i; - for( i = controls.begin() ; i != controls.end() ; i++ ) + for( i = controls.begin() ; i != controls.end() ; ++i ) { ConfigControl *c = qobject_cast(*i); c->doApply( p_intf ); @@ -695,13 +776,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])->currentText() ) ); 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 ) @@ -717,7 +799,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 ); @@ -727,8 +809,6 @@ void SPrefsPanel::apply() #ifdef WIN32 CaC( "dshow-caching" ); #else - if (module_exists ( "v4l" )) - CaC( "v4l-caching" ); if (module_exists ( "access_jack" )) CaC( "jack-input-caching" ); if (module_exists ( "v4l2" )) @@ -747,9 +827,14 @@ void SPrefsPanel::apply() case SPrefsInterface: { if( qobject_cast(optionWidgets[skinRB])->isChecked() ) - config_PutPsz( p_intf, "intf", "skins2" ); - if( qobject_cast(optionWidgets[qtRB])->isChecked() ) - config_PutPsz( p_intf, "intf", "qt" ); + config_PutPsz( p_intf, "intf", "skins2,any" ); + else + //if( qobject_cast(optionWidgets[qtRB])->isChecked() ) + config_PutPsz( p_intf, "intf", "" ); + if( qobject_cast(optionWidgets[styleCB]) ) + getSettings()->setValue( "MainWindow/QtStyle", + qobject_cast(optionWidgets[styleCB])->currentText() ); + break; } @@ -787,10 +872,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 ) @@ -815,28 +914,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 ); @@ -868,7 +962,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 ) @@ -881,15 +975,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 ) @@ -924,7 +1018,7 @@ void addAsso( QVLCRegistry *qvReg, const char *psz_ext ) /* Save a backup if already assigned */ char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" ); - if( psz_value && strlen( psz_value ) > 0 ) + if( !EMPTY_STR(psz_value) ) qvReg->WriteRegistryString( psz_ext, "VLC.backup", psz_value ); delete psz_value;