/*****************************************************************************
* simple_preferences.cpp : "Simple preferences"
****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
* $Id: preferences.cpp 16348 2006-08-25 21:10:10Z zorglub $
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <QString>
-#include <QFont>
-#include <QToolButton>
-#include <QButtonGroup>
-#include <QUrl>
-
#include "components/simple_preferences.hpp"
#include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
-
-#include <vlc_config_cat.h>
-#include "ui/sprefs_audio.h"
#include "ui/sprefs_input.h"
+#include "ui/sprefs_audio.h"
#include "ui/sprefs_video.h"
#include "ui/sprefs_subtitles.h"
#include "ui/sprefs_hotkeys.h"
#include "ui/sprefs_interface.h"
+#include <vlc_config_cat.h>
+#include <vlc_configuration.h>
+
+#include <QString>
+#include <QFont>
+#include <QToolButton>
+#include <QButtonGroup>
+#include <QUrl>
+#include <QVBoxLayout>
+
#define ICON_HEIGHT 64
-#define BUTTON_HEIGHT 76
+#define BUTTON_HEIGHT 74
/*********************************************************************
* The List of categories
{ \
Ui::SPrefs ## name ui; \
ui.setupUi( panel ); \
- panel_label->setText( qtr( label ) );
+ panel_label->setText( label );
#define END_SPREFS_CAT \
break; \
switch( number )
{
/* Video Panel Implementation */
- START_SPREFS_CAT( Video , "General video settings" );
- #ifndef WIN32
- ui.directXBox->setVisible( false );
- #endif
+ START_SPREFS_CAT( Video , qtr("General video settings") );
CONFIG_GENERIC( "video", Bool, NULL, 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_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
+ CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
CONFIG_GENERIC( "vout", Module, NULL, outputModule );
#ifdef WIN32
CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
- CONFIG_GENERIC( "directx-device", StringList, NULL,
+ CONFIG_GENERIC( "directx-device", StringList, NULL,
dXdisplayDevice );
+#else
+ ui.directXBox->setVisible( false );
#endif
CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
END_SPREFS_CAT;
/* Audio Panel Implementation */
- START_SPREFS_CAT( Audio, "General audio settings" );
-#ifdef WIN32
- ui.OSSBrowse->hide();
- ui.OSSDevice->hide();
- ui.OSSLabel->hide();
- ui.alsaDevice->hide();
- ui.alsaLabel->hide();
-#else
- ui.DirectXLabel->setVisible( false );
- ui.DirectXDevice->setVisible( false );
-#endif
- CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+ START_SPREFS_CAT( Audio, qtr("General audio settings") );
- CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
- defaultVolume );
- CONFIG_GENERIC( "audio-language" , StringList , NULL,
- preferredAudioLanguage ); //FIXME
+ CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
- CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
- CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
- detectionDolby );
+ CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
+ defaultVolume );
+ CONFIG_GENERIC( "audio-language" , String , NULL,
+ preferredAudioLanguage );
- CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
+ CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
+ CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
+ detectionDolby );
+
+ CONFIG_GENERIC( "aout", Module, NULL, outputModule );
+
+ CONNECT( ui.outputModule, currentIndexChanged( int ), this,
+ updateAudioOptions( int ) );
+ audioOutput = ui.outputModule;
+
+ //FIXME: use modules_Exists
#ifndef WIN32
- CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
- CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse );
+ CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice );
+ 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, fileName,
+ fileBrowseButton );
+ alsa_options = ui.alsaControl;
+ oss_options = ui.OSSControl;
+ directx_options = ui.DirectXControl;
+ file_options = ui.fileControl;
+
+ /* and hide if necessary */
+#ifdef WIN32
+ oss_options->hide();
+ alsa_options->hide();
#else
- CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
- DirectXDevice );
+ directx_options->hide();
#endif
- CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName,
- fileBrowseButton );
- CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
+ updateAudioOptions( audioOutput->currentIndex() );
+
+ CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
- CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
+ CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
volNormalizer );
- CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
+ CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
+
+
+ CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
+ lastfm_user_edit );
+ CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
+ lastfm_pass_edit );
+ ui.lastfm_user_edit->hide();
+ ui.lastfm_user_label->hide();
+ ui.lastfm_pass_edit->hide();
+ ui.lastfm_pass_label->hide();
+
+ if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
+ ui.lastfm->setCheckState( Qt::Checked );
+ else
+ ui.lastfm->setCheckState( Qt::Unchecked );
+ CONNECT( ui.lastfm, stateChanged( int ), this , lastfm_Changed( int ) );
+
END_SPREFS_CAT;
/* Input and Codecs Panel Implementation */
- START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" );
+ START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
+ inputDevice = ui.DVDDevice;
/* Disk Devices */
-/* CONFIG_GENERIC( );*/ //FIXME
+ {
+ ui.DVDDevice->setToolTip( qtr( "If this propriety 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 ) )
+ {
+ ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
+ }
+ delete psz_cddadiscpath; delete psz_dvddiscpath; delete psz_vcddiscpath;
+ }
CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
-
+#ifdef WIN32
+ CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
+#else
+ ui.systemCodecBox->hide();
+#endif
CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox );
CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox );
-// CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record
+// CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record
END_SPREFS_CAT;
/* Interface Panel */
- START_SPREFS_CAT( Interface, "Interface settings" );
+ START_SPREFS_CAT( Interface, qtr("Interface settings") );
ui.defaultLabel->setFont( italicFont );
ui.skinsLabel->setFont( italicFont );
- CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
-#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
- ui.OneInterfaceBox->hide();
+#if defined( WIN32 ) || defined (__APPLE__)
+ CONFIG_GENERIC( "language", StringList, NULL, language );
+#else
+ ui.language->hide();
+ ui.languageLabel->hide();
#endif
- /* interface */
-/* p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
+
+ /* interface */
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
- ui.qt4->setChecked( true );
+ {
+ ui.qt4->setChecked( true );
+ }
if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
- ui.skins->setChecked( true );*/
-/* CONFIG_GENERIC( "intf", Module, NULL, ??? ); */ //FIXME interface choice
+ {
+ ui.skins->setChecked( true );
+ }
+ //FIXME interface choice
+
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
- CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
+ CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
skinBrowse );
#if defined( WIN32 ) || defined(HAVE_DBUS_3)
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
- CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
+ CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode );
+#else
+ ui.OneInterfaceBox->hide();
#endif
END_SPREFS_CAT;
- START_SPREFS_CAT( Subtitles, "Subtitles & OSD settings" );
+ START_SPREFS_CAT( Subtitles, qtr("Subtitles & OSD settings") );
CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
- CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME
- CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
- fontBrowse );
+ CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
+ CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
+ fontBrowse );
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
fontSize );
this->setLayout(panel_layout);
}
+void SPrefsPanel::updateAudioOptions( int number)
+{
+ QString value = audioOutput->itemData( number ).toString();
+ msg_Dbg( p_intf, "I was here, waiting for funman, %s", qtu( value ) );
+
+#ifndef WIN32
+ oss_options->hide();
+ alsa_options->hide();
+#else
+ directx_options->hide();
+#endif
+ file_options->hide();
+
+ if( value == "aout_file" )
+ file_options->show();
+#ifndef WIN32
+ else if( value == "alsa" )
+ alsa_options->show();
+ else if( value == "oss" )
+ oss_options->show();
+#else
+ else if( value == "directx" )
+ directx_options->show();
+#endif
+}
+
void SPrefsPanel::apply()
{
QList<ConfigControl *>::Iterator i;
ConfigControl *c = qobject_cast<ConfigControl *>(*i);
c->doApply( p_intf );
}
+ /* Devices */
+ //FIXME is it qta or qtu ????
+ char *psz_devicepath = qtu( inputDevice->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 );
+ }
}
void SPrefsPanel::clean()
{}
+void SPrefsPanel::lastfm_Changed( int i_state )
+{
+ if( i_state == Qt::Checked )
+ config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+ else if( i_state == Qt::Unchecked )
+ config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+}