/*****************************************************************************
* simple_preferences.cpp : "Simple preferences"
****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2010 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include "components/simple_preferences.hpp"
#include "components/preferences_widgets.hpp"
+#include "dialogs/ml_configuration.hpp"
#include <vlc_config_cat.h>
#include <vlc_configuration.h>
#include <QStyleFactory>
#include <QSettings>
#include <QtAlgorithms>
+#include <QDir>
#define ICON_HEIGHT 64
#ifdef WIN32
# include <vlc_windows_interfaces.h>
#endif
+#include <vlc_modules.h>
/*********************************************************************
* The List of categories
#define ADD_CATEGORY( button, label, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \
+ button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \
button->setText( label ); \
+ button->setToolTip( label + qtr("Preferences") ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
button->setIconSize( QSize( icon_height, icon_height ) ); \
button->resize( icon_height + 6 , icon_height + 6 ); \
// Title Label
QLabel *panel_label = new QLabel;
- QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
+ QFont labelFont = QApplication::font();
labelFont.setPointSize( labelFont.pointSize() + 6 );
panel_label->setFont( labelFont );
title_line->setFrameShape(QFrame::HLine);
title_line->setFrameShadow(QFrame::Sunken);
- QFont italicFont = QApplication::font( static_cast<QWidget*>(0) );
+ QFont italicFont = QApplication::font();
italicFont.setItalic( true );
switch( number )
QComboBox * name ## Device = new QComboBox( name ## Control ); \
name ## Layout->addWidget( name ## Device ); \
name ## Label->setBuddy( name ## Device ); \
+ name ## Device->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );\
outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
#define audioControl2( name) \
{
audioControl( alsa );
optionWidgets.append( alsaControl );
-
CONFIG_GENERIC_NO_UI( "alsa-audio-device" , StringList, alsaLabel,
alsaDevice );
}
#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 ) );
/* 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"
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 );
}
- CONFIG_GENERIC_FILE( "dvd", File, ui.DVDLabel,
- ui.DVDDevice, ui.DVDBrowse );
+#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 );
ui.live555TransportHTTPRadio->hide();
ui.live555TransportLabel->hide();
}
+ CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
#ifdef WIN32
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
- CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
- optionWidgets.append( ui.DVDDevice );
+ optionWidgets.append( ui.DVDDeviceComboBox );
optionWidgets.append( ui.cachingCombo );
CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
- CONFIG_BOOL( "skip-frames", skipFrames );
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 );
#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"))
ui.assoButton->hide();
ui.assocLabel->hide();
#endif
+#ifdef MEDIA_LIBRARY
+ BUTTONACT( ui.sqlMLbtn, configML() );
+#endif
+
/* interface */
char *psz_intf = config_GetPsz( p_intf, "intf" );
if( psz_intf )
ui.stylesCombo->hide();
optionWidgets.append( NULL );
#endif
-
- 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 ) );
+ 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 ) );
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_BOOL( "qt-video-autoresize", resizingBox );
CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
artFetcher );
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__)
qtr("Subtitles & On Screen Display Settings") );
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 );
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;
}
void SPrefsPanel::updateAudioVolume( int volume )
{
qobject_cast<QSpinBox *>(optionWidgets[volLW])
- ->setValue( volume * 100 / 256 );
+ ->setValue( volume * 100 / QT_VOLUME_DEFAULT );
}
{
/* Generic save for ever panel */
QList<ConfigControl *>::Iterator i;
- for( i = controls.begin() ; i != controls.end() ; i++ )
+ for( i = controls.begin() ; i != controls.end() ; ++i )
{
ConfigControl *c = qobject_cast<ConfigControl *>(*i);
- c->doApply( p_intf );
+ c->doApply();
}
switch( number )
{
/* Device default selection */
char *psz_devicepath =
- strdup( qtu( qobject_cast<QLineEdit *>(optionWidgets[inputLE] )->text() ) );
+ strdup( qtu( qobject_cast<QComboBox *>(optionWidgets[inputLE])->currentText() ) );
if( !EMPTY_STR( psz_devicepath ) )
{
config_PutPsz( p_intf, "dvd", psz_devicepath );
#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" ))
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", "qt" );
+ config_PutPsz( p_intf, "intf", "skins2,any" );
+ else
+ //if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
+ config_PutPsz( p_intf, "intf", "" );
if( qobject_cast<QComboBox *>(optionWidgets[styleCB]) )
getSettings()->setValue( "MainWindow/QtStyle",
qobject_cast<QComboBox *>(optionWidgets[styleCB])->currentText() );
QWidgetList::iterator it = widgets.begin();
while( it != widgets.end() ) {
(*it)->update();
- it++;
+ ++it;
};
}
+void SPrefsPanel::configML()
+{
+#ifdef MEDIA_LIBRARY
+ MLConfDialog *mld = new MLConfDialog( this, p_intf );
+ mld->exec();
+ delete mld;
+#endif
+}
+
#ifdef WIN32
#include <QDialogButtonBox>
-#include <QHeaderView>
#include "util/registry.hpp"
#include <string>
/* 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;
projects / vlc / blobdiff