X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=533fc8bb328e5aa6bf0fa3e8cd3e1b27d0f72a2f;hb=6576b0b21a58a87207a5b7e72887659de3bd3fd1;hp=a7827c0126ece9e3691c0bf58b53b1da1d37c941;hpb=61fc0c2faabf6c6216721c0a1c55839b9b16eea0;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index a7827c0126..533fc8bb32 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -22,6 +22,9 @@ * 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 #include "components/simple_preferences.hpp" #include "components/preferences_widgets.hpp" @@ -211,6 +214,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, /* 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, preferredAudioLanguage ); @@ -230,7 +236,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONNECT( ui.outputModule, currentIndexChanged( int ), this, updateAudioOptions( int ) ); -#ifndef WIN32 +#ifdef WIN32 + CONFIG_GENERIC( "directx-audio-device", IntegerList, + ui.DirectXLabel, DirectXDevice ); +#else if( module_Exists( p_intf, "alsa" ) ) { CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, @@ -241,9 +250,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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, @@ -255,6 +261,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, optionWidgets.append( ui.fileControl ); optionWidgets.append( ui.outputModule ); optionWidgets.append( ui.volNormBox ); + /*Little mofification of ui.volumeValue to compile with Qt < 4.3 */ +#ifdef QT43 + ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons); +#endif + optionWidgets.append( ui.volumeValue ); updateAudioOptions( ui.outputModule->currentIndex() ); /* LastFM */ @@ -286,6 +297,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ui.volNormSpin->setEnabled( b_normalizer ); } + /* Volume Label */ + updateAudioVolume( ui.defaultVolume->value() ); // First time init + END_SPREFS_CAT; /* Input and Codecs Panel Implementation */ @@ -396,7 +410,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #if defined( WIN32 ) || defined (__APPLE__) CONFIG_GENERIC( "language", StringList, NULL, language ); - BUTTONACT( ui.assoButton, assoDialog ); + BUTTONACT( ui.assoButton, assoDialog() ); #else ui.language->hide(); ui.languageLabel->hide(); @@ -421,12 +435,21 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); - CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates ); +#ifdef UPDATE_CHECK + CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox ); + CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL, + updatesDays ); + CONNECT( ui.updatesBox, toggled( bool ), + ui.updatesDays, setEnabled( bool ) ); +#else + 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 ) +#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__) CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, EnqueueOneInterfaceMode ); @@ -457,11 +480,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, panel->setLayout( gLayout ); int line = 0; - KeySelectorControl *ksCtrl = - new KeySelectorControl( VLC_OBJECT(p_intf), p_config , + control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config , this, gLayout, line ); panel_label->setText( qtr( "Configure Hotkeys" ) ); + controls.append( control ); break; } @@ -480,15 +503,22 @@ void SPrefsPanel::updateAudioOptions( int number) QString value = qobject_cast(optionWidgets[audioOutCoB]) ->itemData( number ).toString(); -#ifndef WIN32 +#ifdef WIN32 + optionWidgets[directxW]->setVisible( ( value == "directx" ) ); +#else optionWidgets[ossW]->setVisible( ( value == "oss" ) ); optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); -#else - optionWidgets[directxW]->setVisible( ( value == "directx" ) ); #endif optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); } +void SPrefsPanel::updateAudioVolume( int volume ) +{ + qobject_cast(optionWidgets[volLW]) + ->setValue( volume * 100 / 256 ); +} + + /* Function called from the main Preferences dialog on each SPrefs Panel */ void SPrefsPanel::apply() { @@ -543,28 +573,28 @@ void SPrefsPanel::apply() { msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue ); CaC( "udp-caching" ); - if (module_Exists (p_intf, "dvdread")) + if (module_Exists (p_intf, "dvdread" )) CaC( "dvdread-caching" ); - if (module_Exists (p_intf, "dvdnav")) + if (module_Exists (p_intf, "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")) + if (module_Exists (p_intf, "access_realrtsp" )) CaCi( "realrtsp-caching", 10 ); CaCi( "mms-caching", 19 ); #ifdef WIN32 CaC( "dshow-caching" ); #else - if (module_Exists (p_intf, "v4l")) + if (module_Exists (p_intf, "v4l" )) CaC( "v4l-caching" ); - if (module_Exists (p_intf, "access_jack")) + if (module_Exists (p_intf, "access_jack" )) CaC( "jack-input-caching" ); - if (module_Exists (p_intf, "v4l2")) + if (module_Exists (p_intf, "v4l2" )) CaC( "v4l2-caching" ); - if (module_Exists (p_intf, "pvr")) + if (module_Exists (p_intf, "pvr" )) CaC( "pvr-caching" ); #endif //CaCi( "dv-caching" ) too short... @@ -625,7 +655,182 @@ void SPrefsPanel::lastfm_Changed( int i_state ) config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ); } +#ifdef WIN32 +#include +#include +#include "util/registry.hpp" + +bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current, + QTreeWidgetItem* parent, QVLCRegistry *qvReg ) +{ + bool b_temp; + const char* psz_VLC = "VLC"; + current = new QTreeWidgetItem( parent, QStringList( psz_ext ) ); + + if( strstr( qvReg->ReadRegistryString( psz_ext, "", "" ), psz_VLC ) ) + { + current->setCheckState( 0, Qt::Checked ); + b_temp = false; + } + else + { + current->setCheckState( 0, Qt::Unchecked ); + b_temp = true; + } + listAsso.append( current ); + return b_temp; +} + void SPrefsPanel::assoDialog() { + QDialog *d = new QDialog( this ); + QGridLayout *assoLayout = new QGridLayout( d ); + + QTreeWidget *filetypeList = new QTreeWidget; + assoLayout->addWidget( filetypeList, 0, 0, 1, 4 ); + filetypeList->header()->hide(); + + QVLCRegistry * qvReg = new QVLCRegistry( HKEY_CLASSES_ROOT ); + + QTreeWidgetItem *audioType = new QTreeWidgetItem( QStringList( qtr( "Audio Files" ) ) ); + QTreeWidgetItem *videoType = new QTreeWidgetItem( QStringList( qtr( "Video Files" ) ) ); + QTreeWidgetItem *otherType = new QTreeWidgetItem( QStringList( qtr( "Playlist Files" ) ) ); + + filetypeList->addTopLevelItem( audioType ); + filetypeList->addTopLevelItem( videoType ); + filetypeList->addTopLevelItem( otherType ); + + audioType->setExpanded( true ); audioType->setCheckState( 0, Qt::Unchecked ); + videoType->setExpanded( true ); videoType->setCheckState( 0, Qt::Unchecked ); + otherType->setExpanded( true ); otherType->setCheckState( 0, Qt::Unchecked ); + + QTreeWidgetItem *currentItem; + + int i_temp = 0; +#define aTa( name ) i_temp += addType( name, currentItem, audioType, qvReg ) +#define aTv( name ) i_temp += addType( name, currentItem, videoType, qvReg ) +#define aTo( name ) i_temp += addType( name, currentItem, otherType, qvReg ) + + 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" ); + audioType->setCheckState( 0, ( i_temp > 0 ) ? + ( ( i_temp == audioType->childCount() ) ? + Qt::Checked : Qt::PartiallyChecked ) + : Qt::Unchecked ); + + 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( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" ); + aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" ); + aTv( ".vob" ); 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" ); + otherType->setCheckState( 0, ( i_temp > 0 ) ? + ( ( i_temp == audioType->childCount() ) ? + Qt::Checked : Qt::PartiallyChecked ) + : Qt::Unchecked ); + + QDialogButtonBox *buttonBox = new QDialogButtonBox( d ); + QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) ); + QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) ); + buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole ); + buttonBox->addButton( clearButton, QDialogButtonBox::ActionRole ); + + assoLayout->addWidget( buttonBox, 1, 2, 1, 2 ); + + CONNECT( closeButton, clicked(), this, saveAsso() ); + CONNECT( clearButton, clicked(), d, reject() ); + d->resize( 300, 400 ); + d->exec(); + delete d; + delete qvReg; + listAsso.clear(); +} + +void addAsso( QVLCRegistry *qvReg, char *psz_ext ) +{ + std::string s_path( "VLC" ); s_path += psz_ext; + std::string s_path2 = s_path; + + /* Save a backup if already assigned */ + char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" ); + + if( psz_value && strlen( psz_value ) > 0 ) + qvReg->WriteRegistryString( psz_ext, "VLC.backup", psz_value ); + delete psz_value; + + /* Put a "link" to VLC.EXT as default */ + qvReg->WriteRegistryString( psz_ext, "", s_path.c_str() ); + + /* Create the needed Key if they weren't done in the installer */ + if( !qvReg->RegistryKeyExists( s_path.c_str() ) ) + { + qvReg->WriteRegistryString( psz_ext, "", s_path.c_str() ); + qvReg->WriteRegistryString( s_path.c_str(), "", "Media file" ); + qvReg->WriteRegistryString( s_path.append( "\\shell" ).c_str() , "", "Play" ); + + /* Get the installer path */ + QVLCRegistry *qvReg2 = new QVLCRegistry( HKEY_LOCAL_MACHINE ); + std::string str_temp; str_temp.assign( + qvReg2->ReadRegistryString( "Software\\VideoLAN\\VLC", "", "" ) ); + + if( str_temp.size() ) + { + qvReg->WriteRegistryString( s_path.append( "\\Play\\command" ).c_str(), + "", str_temp.append(" --started-from-file \"%1\"" ).c_str() ); + + qvReg->WriteRegistryString( s_path2.append( "\\DefaultIcon" ).c_str(), + "", str_temp.append(",0").c_str() ); + } + delete qvReg2; + } +} + +void delAsso( QVLCRegistry *qvReg, char *psz_ext ) +{ + char psz_VLC[] = "VLC"; + char *psz_value = qvReg->ReadRegistryString( psz_ext, "", "" ); + if( psz_value && !strcmp( strcat( psz_VLC, psz_ext ), psz_value ) ) + { + free( psz_value ); + psz_value = qvReg->ReadRegistryString( psz_ext, "VLC.backup", "" ); + if( psz_value ) + qvReg->WriteRegistryString( psz_ext, "", psz_value ); + + qvReg->DeleteKey( psz_ext, "VLC.backup" ); + } + delete( psz_value ); } +void SPrefsPanel::saveAsso() +{ + QVLCRegistry * qvReg; + for( int i = 0; i < listAsso.size(); i ++ ) + { + qvReg = new QVLCRegistry( HKEY_CLASSES_ROOT ); + if( listAsso[i]->checkState( 0 ) > 0 ) + { + addAsso( qvReg, qtu( listAsso[i]->text( 0 ) ) ); + } + else + { + delAsso( qvReg, qtu( listAsso[i]->text( 0 ) ) ); + } + } + /* Gruik ? Naaah */ + qobject_cast(listAsso[0]->treeWidget()->parent())->accept(); + delete qvReg; +} + +#endif /* WIN32 */ +