* 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"
-
-
#include <vlc_config_cat.h>
#include <vlc_configuration.h>
CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
- CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
CONFIG_GENERIC( "vout", Module, NULL, outputModule );
#ifdef WIN32
#endif
CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
- snapshotsDirectory, snapshotsDirectoryBrowse );
+ snapshotsDirectory, snapshotsDirectoryBrowse );
CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
snapshotsSequentialNumbering );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
- /* and hide if necessary */
-
+ /* hide if necessary */
#ifdef WIN32
ui.OSSControl->hide();
ui.alsaControl->hide();
/* Audio Output Specifics */
CONFIG_GENERIC( "aout", Module, NULL, outputModule );
- CONNECT( ui.outputModule, currentIndexChanged( int ), this,
- updateAudioOptions( int ) );
-
+ CONNECT( ui.outputModule, currentIndexChanged( int ),
+ this, updateAudioOptions( int ) );
- //TODO: use modules_Exists
#ifndef WIN32
- CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice );
- CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
+ if( module_Exists( p_intf, "alsa" ) )
+ {
+ CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel,
+ alsaDevice );
+ }
+ if( module_Exists( p_intf, "oss" ) )
+ {
+ CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
OSSBrowse );
+ }
#else
CONFIG_GENERIC( "directx-audio-device", IntegerList,
ui.DirectXLabel, DirectXDevice );
updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */
- CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
- lastfm_user_edit );
- CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
- lastfm_pass_edit );
-
- if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
- ui.lastfm->setCheckState( Qt::Checked );
+ if( module_Exists( p_intf, "audioscrobbler" ) )
+ {
+ CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
+ lastfm_user_edit );
+ CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
+ lastfm_pass_edit );
+
+ if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
+ ui.lastfm->setChecked( true );
+ else
+ ui.lastfm->setChecked( false );
+ CONNECT( ui.lastfm, stateChanged( int ), this ,
+ lastfm_Changed( int ) );
+ }
else
- ui.lastfm->setCheckState( Qt::Unchecked );
- CONNECT( ui.lastfm, stateChanged( int ), this ,
- lastfm_Changed( int ) );
+ ui.lastfm->hide();
/* Normalizer */
/* Disk Devices */
{
ui.DVDDevice->setToolTip(
- qtr( "If this propriety is blank, then you have\n"
+ //TODO: make this sentence understandable
+ qtr( "If this property is blank, then you have\n"
"values for DVD, VCD, and CDDA.\n"
"You can define a unique one or set that in"
"the advanced preferences" ) );
char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" );
char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" );
char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" );
- if( ( *psz_cddadiscpath == *psz_dvddiscpath )
- && ( *psz_dvddiscpath == *psz_vcddiscpath ) )
+ if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath )
+ if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) &&
+ !strcmp( psz_dvddiscpath, psz_vcddiscpath ) )
{
ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
}
addToCachingBox( "Higher latency", CachingHigher );
#define TestCaC( name ) \
- b_cache_equal = b_cache_equal && ( i_cache == config_GetInt( p_intf, name ) );
+ b_cache_equal = b_cache_equal && \
+ ( i_cache == config_GetInt( p_intf, name ) )
#define TestCaCi( name, int ) \
- b_cache_equal = b_cache_equal && ( ( i_cache * int ) == config_GetInt( p_intf, name ) );
+ b_cache_equal = b_cache_equal && \
+ ( ( i_cache * int ) == config_GetInt( p_intf, name ) )
/* Select the accurate value of the ComboBox */
bool b_cache_equal = true;
int i_cache = config_GetInt( p_intf, "file-caching");
- TestCaC( "udp-caching" ) TestCaC( "dvdread-caching" )
- TestCaC( "dvdnav-caching" ) TestCaC( "tcp-caching" )
- TestCaC( "fake-caching" ) TestCaC( "cdda-caching" )
- TestCaC( "screen-caching" ) TestCaC( "vcd-caching" )
+ TestCaC( "udp-caching" );
+ if (module_Exists (p_intf, "dvdread"))
+ TestCaC( "dvdread-caching" );
+ if (module_Exists (p_intf, "dvdnav"))
+ TestCaC( "dvdnav-caching" );
+ TestCaC( "tcp-caching" );
+ TestCaC( "fake-caching" ); TestCaC( "cdda-caching" );
+ TestCaC( "screen-caching" ); TestCaC( "vcd-caching" );
#ifdef WIN32
- TestCaC( "dshow-caching" )
+ TestCaC( "dshow-caching" );
#else
- TestCaC( "v4l-caching" ) TestCaC( "jack-input-caching" )
- TestCaC( "v4l2-caching" ) TestCaC( "pvr-caching" )
+ if (module_Exists (p_intf, "v4l"))
+ TestCaC( "v4l-caching" );
+ if (module_Exists (p_intf, "access_jack"))
+ TestCaC( "jack-input-caching" );
+ if (module_Exists (p_intf, "v4l2"))
+ TestCaC( "v4l2-caching" );
+ if (module_Exists (p_intf, "pvr"))
+ TestCaC( "pvr-caching" );
#endif
- TestCaCi( "rtsp-caching", 4 ) TestCaCi( "ftp-caching", 2 )
- TestCaCi( "http-caching", 4 ) TestCaCi( "realrtsp-caching", 10 )
- TestCaCi( "mms-caching", 19 )
- if( b_cache_equal )
- ui.cachingCombo->setCurrentIndex( ui.cachingCombo->findData( QVariant( i_cache ) ) );
+ TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 );
+ TestCaCi( "http-caching", 4 );
+ if (module_Exists (p_intf, "access_realrtsp"))
+ TestCaCi( "realrtsp-caching", 10 );
+ TestCaCi( "mms-caching", 19 );
+ if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
+ ui.cachingCombo->findData( QVariant( i_cache ) ) );
END_SPREFS_CAT;
/*******************
#if defined( WIN32 ) || defined (__APPLE__)
CONFIG_GENERIC( "language", StringList, NULL, language );
+ BUTTONACT( ui.assoButton, assoDialog() );
#else
ui.language->hide();
ui.languageLabel->hide();
+ ui.assoName->hide();
+ ui.assoButton->hide();
#endif
/* interface */
optionWidgets.append( ui.skins );
optionWidgets.append( ui.qt4 );
+ CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher );
+ CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
+#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 )
END_SPREFS_CAT;
- START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
- //FIMXE
- END_SPREFS_CAT;
+ case SPrefsHotkeys:
+ {
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-fullscreen" );
+
+ QGridLayout *gLayout = new QGridLayout;
+ panel->setLayout( gLayout );
+ int line = 0;
+
+ control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
+ this, gLayout, line );
+
+ panel_label->setText( qtr( "Configure Hotkeys" ) );
+ controls.append( control );
+
+ break;
}
+ }
panel_layout->addWidget( panel_label );
panel_layout->addWidget( title_line );
panel_layout->addWidget( panel );
- panel_layout->addStretch( 2 );
+ if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 );
setLayout( panel_layout );
}
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
}
+/* Function called from the main Preferences dialog on each SPrefs Panel */
void SPrefsPanel::apply()
{
msg_Dbg( p_intf, "Trying to save the %i simple panel", number );
c->doApply( p_intf );
}
- /* Devices */
- if( number == SPrefsInputAndCodecs )
+ switch( number )
+ {
+ case SPrefsInputAndCodecs:
{
/* Device default selection */
char *psz_devicepath =
saveBox( "bandwidth", qobject_cast<QCheckBox *>(optionWidgets[bandwidthChB] ) );
config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) );
-#define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue );
-#define CaC( name ) CaCi( name, 1 );
+#define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue )
+#define CaC( name ) CaCi( name, 1 )
/* Caching */
QComboBox *cachingCombo = qobject_cast<QComboBox *>(optionWidgets[cachingCoB]);
int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt();
if( i_comboValue )
{
- msg_Dbg( p_intf, "Adjusting all the cache values at level: %i", i_comboValue );
- CaC( "udp-caching" ); CaC( "dvdread-caching" );
- CaC( "dvdnav-caching" ); CaC( "tcp-caching" ); CaC( "vcd-caching" );
+ msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue );
+ CaC( "udp-caching" );
+ if (module_Exists (p_intf, "dvdread" ))
+ CaC( "dvdread-caching" );
+ 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 ); CaCi( "realrtsp-caching", 10 );
+ CaCi( "http-caching", 4 );
+ if (module_Exists (p_intf, "access_realrtsp" ))
+ CaCi( "realrtsp-caching", 10 );
CaCi( "mms-caching", 19 );
#ifdef WIN32
CaC( "dshow-caching" );
#else
- CaC( "v4l-caching" ); CaC( "jack-input-caching" ); CaC( "v4l2-caching" );
- CaC( "pvr-caching" );
+ if (module_Exists (p_intf, "v4l" ))
+ CaC( "v4l-caching" );
+ if (module_Exists (p_intf, "access_jack" ))
+ CaC( "jack-input-caching" );
+ if (module_Exists (p_intf, "v4l2" ))
+ CaC( "v4l2-caching" );
+ if (module_Exists (p_intf, "pvr" ))
+ CaC( "pvr-caching" );
#endif
//CaCi( "dv-caching" ) too short...
}
+ break;
}
/* Interfaces */
- if( number == SPrefsInterface )
+ case SPrefsInterface:
{
if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
config_PutPsz( p_intf, "intf", "skins2" );
if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
config_PutPsz( p_intf, "intf", "qt4" );
+ break;
}
- if( number == SPrefsAudio )
+ case SPrefsAudio:
{
bool b_normChecked =
qobject_cast<QCheckBox *>(optionWidgets[normalizerChB])->isChecked();
if( b_normChecked ) qs_filter.append( ":volnorm" );
}
config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) );
+ break;
+ }
}
}
else if( i_state == Qt::Unchecked )
config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
}
+
+#ifdef WIN32
+#include <QDialogButtonBox>
+#include <QHeaderView>
+#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<QDialog *>(listAsso[0]->treeWidget()->parent())->accept();
+ delete qvReg;
+}
+
+#endif /* WIN32 */
+
projects / vlc / blobdiff