#ifdef WIN32
# include <vlc_windows_interfaces.h>
#endif
+#include <vlc_modules.h>
/*********************************************************************
* The List of categories
// Title Label
QLabel *panel_label = new QLabel;
- QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
+ QFont labelFont = QApplication::font();
labelFont.setPointSize( labelFont.pointSize() + 6 );
- labelFont.setFamily( "Verdana" );
panel_label->setFont( labelFont );
// Title <hr>
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 )
CONFIG_BOOL( "overlay", overlay );
CONFIG_BOOL( "video-on-top", alwaysOnTop );
CONFIG_BOOL( "video-deco", windowDecorations );
- CONFIG_BOOL( "skip-frames", skipFrames );
CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule );
CONFIG_BOOL( "video-wallpaper", wallpaperMode );
#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 ) );
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.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 );
+ CONFIG_GENERIC( "sout-x264-level", String, ui.x264profileLabel, levelBox );
/* Caching */
/* Add the things to the ComboBox */
if (module_exists ("dvdnav"))
TestCaC( "dvdnav-caching" );
TestCaC( "tcp-caching" );
- TestCaC( "fake-caching" ); TestCaC( "cdda-caching" );
+ TestCaC( "cdda-caching" );
TestCaC( "screen-caching" ); TestCaC( "vcd-caching" );
#ifdef WIN32
TestCaC( "dshow-caching" );
// ui.defaultLabel->setFont( italicFont );
ui.skinsLabel->setText(
qtr( "This is VLC's skinnable interface. You can download other skins at" )
- + QString( " <a href=\"http://www.videolan.org/vlc/skins.php\">VLC skins website</a>." ) );
+ + QString( " <a href=\"http://www.videolan.org/vlc/skins.php\">" )
+ + qtr( "VLC skins website" )+ QString( "</a>." ) );
ui.skinsLabel->setFont( italicFont );
#if defined( WIN32 )
BUTTONACT( ui.assoButton, assoDialog() );
#else
ui.languageBox->hide();
- ui.assoBox->hide();
+ ui.assoButton->hide();
+ ui.assocLabel->hide();
#endif
/* interface */
char *psz_intf = config_GetPsz( p_intf, "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 ) );
CONFIG_BOOL( "qt-fs-controller", fsController );
CONFIG_BOOL( "qt-system-tray", systrayBox );
CONFIG_BOOL( "qt-notification", sysPop );
+ CONFIG_BOOL( "playlist-tree", treePlaylist );
CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
ui.fileSkin, ui.skinBrowse );
CONFIG_BOOL( "qt-video-autoresize", resizingBox );
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__)
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 );
break;
void SPrefsPanel::updateAudioVolume( int volume )
{
qobject_cast<QSpinBox *>(optionWidgets[volLW])
- ->setValue( volume * 100 / 256 );
+ ->setValue( volume * 100 / QT_VOLUME_DEFAULT );
}
if (module_exists ("dvdnav" ))
CaC( "dvdnav-caching" );
CaC( "tcp-caching" ); CaC( "vcd-caching" );
- CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
+ CaC( "cdda-caching" ); CaC( "file-caching" );
CaC( "screen-caching" ); CaC( "bd-caching" );
CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 2 );