/*****************************************************************************
* 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_video.h"
#include "ui/sprefs_hotkeys.h"
#include "ui/sprefs_interface.h"
+#include <vlc_config_cat.h>
+
+#include <QString>
+#include <QFont>
+#include <QToolButton>
+#include <QButtonGroup>
+#include <QUrl>
+#include <QVBoxLayout>
+
#define ICON_HEIGHT 64
#define BUTTON_HEIGHT 74
{
/* Video Panel Implementation */
START_SPREFS_CAT( Video , "General video settings" );
- #ifndef WIN32
- ui.directXBox->setVisible( false );
- #endif
- CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
+ 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,
#endif
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
- CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
+ CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume );
- CONFIG_GENERIC( "audio-language" , StringList , NULL,
- preferredAudioLanguage ); //FIXME
+ CONFIG_GENERIC( "audio-language" , String , NULL,
+ preferredAudioLanguage );
CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
- CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
+ CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
detectionDolby );
CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse );
#else
- CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
+ CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
DirectXDevice );
#endif
- CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName,
+ CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName,
fileBrowseButton );
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);
END_SPREFS_CAT;
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
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,
skinBrowse );
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode );
+#else
+ ui.OneInterfaceBox->hide();
#endif
END_SPREFS_CAT;
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 );