#include <QToolButton>
#include <QButtonGroup>
#include <QVBoxLayout>
+#include <QScrollArea>
+#include <QStyleFactory>
+#include <QSettings>
#include <QtAlgorithms>
-#include <string>
-
#define ICON_HEIGHT 64
-#define BUTTON_HEIGHT 74
+
+#ifdef WIN32
+# include <vlc_windows_interfaces.h>
+#endif
/*********************************************************************
* The List of categories
*********************************************************************/
-SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
+SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool small ) :
QWidget( _parent ), p_intf( _p_intf )
{
QVBoxLayout *layout = new QVBoxLayout();
CONNECT( buttonGroup, buttonClicked ( int ),
this, switchPanel( int ) );
+ short icon_height = small ? ICON_HEIGHT /2 : ICON_HEIGHT;
+
#define ADD_CATEGORY( button, label, icon, numb ) \
QToolButton * button = new QToolButton( this ); \
- button->setIcon( QIcon( ":/pixmaps/prefs/" #icon ) ); \
- button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \
+ button->setIcon( QIcon( ":/prefsmenu/" #icon ) ); \
button->setText( label ); \
button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
- button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT); \
+ button->setIconSize( QSize( icon_height, icon_height ) ); \
+ button->resize( icon_height + 6 , icon_height + 6 ); \
button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ; \
button->setAutoRaise( true ); \
button->setCheckable( true ); \
layout->addWidget( button );
ADD_CATEGORY( SPrefsInterface, qtr("Interface"),
- spref_cone_Interface_64.png, 0 );
- ADD_CATEGORY( SPrefsAudio, qtr("Audio"), spref_cone_Audio_64.png, 1 );
- ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 );
+ cone_interface_64, 0 );
+ ADD_CATEGORY( SPrefsAudio, qtr("Audio"),
+ cone_audio_64, 1 );
+ ADD_CATEGORY( SPrefsVideo, qtr("Video"),
+ cone_video_64, 2 );
ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles && OSD"),
- spref_cone_Subtitles_64.png, 3 );
+ cone_subtitles_64, 3 );
ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input && Codecs"),
- spref_cone_Input_64.png, 4 );
- ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
+ cone_input_64, 4 );
+ ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"),
+ cone_hotkeys_64, 5 );
+
+#undef ADD_CATEGORY
SPrefsInterface->setChecked( true );
layout->setMargin( 0 );
* The Panels
*********************************************************************/
SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
- int _number ) : QWidget( _parent ), p_intf( _p_intf )
+ int _number, bool small ) : QWidget( _parent ), p_intf( _p_intf )
{
module_config_t *p_config;
ConfigControl *control;
/******************************
* VIDEO Panel Implementation *
******************************/
- START_SPREFS_CAT( Video , qtr("General Video Settings") );
+ START_SPREFS_CAT( Video , qtr("Video Settings") );
CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
/******************************
* AUDIO Panel Implementation *
******************************/
- START_SPREFS_CAT( Audio, qtr("General Audio Settings") );
+ START_SPREFS_CAT( Audio, qtr("Audio Settings") );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+ ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() );
+ CONNECT( ui.enableAudio, toggled( bool ),
+ ui.SPrefsAudio_zone, setEnabled( bool ) );
#define audioCommon( name ) \
QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \
name ## Layout->setMargin( 0 ); \
name ## Layout->setSpacing( 0 ); \
QLabel * name ## Label = new QLabel( qtr( "Device:" ), name ## Control ); \
- name ## Label->setMinimumSize(QSize(100, 0)); \
+ name ## Label->setMinimumSize(QSize(250, 0)); \
name ## Layout->addWidget( name ## Label ); \
#define audioControl( name) \
name ## Layout->addWidget( name ## Browse ); \
outputAudioLayout->addWidget( name ## Control, outputAudioLayout->rowCount(), 0, 1, -1 );
- /* hide if necessary */
- ui.lastfm_user_edit->hide();
- ui.lastfm_user_label->hide();
- ui.lastfm_pass_edit->hide();
- ui.lastfm_pass_label->hide();
-
/* Build if necessary */
QGridLayout * outputAudioLayout = qobject_cast<QGridLayout *>(ui.outputAudioBox->layout());
#ifdef WIN32
optionWidgets.append( NULL );
#endif
- /* General Audio Options */
+#undef audioControl2
+#undef audioControl
+#undef audioCommon
+
+ /* Audio Options */
CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
defaultVolume );
CONNECT( ui.defaultVolume, valueChanged( int ),
- this, updateAudioVolume( int ) );
+ this, updateAudioVolume( int ) );
+
+ CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, keepVolumeRadio );
+ ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() );
+ CONNECT( ui.resetVolumeRadio, toggled( bool ),
+ ui.defaultVolume_zone, setEnabled( bool ) );
CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage );
CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
- CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, saveVolBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float, NULL,
volNormSpin );
+ CONFIG_GENERIC( "audio-replay-gain-mode", StringList, ui.replayLabel,
+ replayCombo );
CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
visualisation);
ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
optionWidgets.append( ui.volumeValue );
optionWidgets.append( ui.headphoneEffect );
+ optionWidgets.append( ui.spdifBox );
updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */
ui.lastfm->setChecked( true );
else
ui.lastfm->setChecked( false );
+
+ ui.lastfm_zone->setVisible( ui.lastfm->isChecked() );
+
+ CONNECT( ui.lastfm, toggled( bool ),
+ ui.lastfm_zone, setVisible( bool ) );
CONNECT( ui.lastfm, stateChanged( int ),
this, lastfm_Changed( int ) );
}
else
+ {
ui.lastfm->hide();
+ ui.lastfm_zone->hide();
+ }
/* Normalizer */
CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin,
free( psz_dvddiscpath );
free( psz_vcddiscpath );
}
+ 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_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel,
PostProcLevel );
CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair );
- CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox );
+
+ /* live555 module prefs */
+ CONFIG_GENERIC( "rtsp-tcp", Bool, NULL,
+ live555TransportRTSP_TCPRadio );
+ if ( !module_exists( "live555" ) )
+ {
+ ui.live555TransportRTSP_TCPRadio->hide();
+ ui.live555TransportHTTPRadio->hide();
+ ui.live555TransportLabel->hide();
+ }
#ifdef WIN32
CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
#else
ui.systemCodecBox->hide();
+ ui.systemCodecLabel->hide();
#endif
optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo );
+ CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
/* Caching */
/* Add the things to the ComboBox */
addToCachingBox( N_("Normal"), CachingNormal );
addToCachingBox( N_("High latency"), CachingHigh );
addToCachingBox( N_("Higher latency"), CachingHigher );
+ #undef addToCachingBox
#define TestCaC( name ) \
b_cache_equal = b_cache_equal && \
if (module_exists ("pvr"))
TestCaC( "pvr-caching" );
#endif
- TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 );
+ if (module_exists ("livedotcom"))
+ TestCaCi( "rtsp-caching", 4 );
+ TestCaCi( "ftp-caching", 2 );
TestCaCi( "http-caching", 4 );
if (module_exists ("access_realrtsp"))
TestCaCi( "realrtsp-caching", 10 );
TestCaCi( "mms-caching", 19 );
if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
ui.cachingCombo->findData( QVariant( i_cache ) ) );
+#undef TestCaCi
+#undef TestCaC
END_SPREFS_CAT;
/*******************
* Interface Panel *
*******************/
START_SPREFS_CAT( Interface, qtr("Interface Settings") );
- ui.defaultLabel->setFont( italicFont );
+// 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>." ) );
ui.skinsLabel->setFont( italicFont );
#if defined( WIN32 )
CONFIG_GENERIC( "language", StringList, ui.languageLabel, language );
BUTTONACT( ui.assoButton, assoDialog() );
#else
- ui.language->hide();
- ui.languageLabel->hide();
- ui.assoName->hide();
- ui.assoButton->hide();
+ ui.languageBox->hide();
+ ui.assoBox->hide();
#endif
-
/* interface */
char *psz_intf = config_GetPsz( p_intf, "intf" );
if( psz_intf )
{
if( strstr( psz_intf, "skin" ) )
ui.skins->setChecked( true );
- else if( strstr( psz_intf, "qt" ) )
- ui.qt4->setChecked( true );
+ } else {
+ /* defaults to qt */
+ ui.qt4->setChecked( true );
}
free( psz_intf );
optionWidgets.append( ui.skins );
optionWidgets.append( ui.qt4 );
+#if !defined(NDEBUG) || !defined( WIN32)
+ ui.stylesCombo->addItem( qtr("System's default") );
+ ui.stylesCombo->addItems( QStyleFactory::keys() );
+ ui.stylesCombo->setCurrentIndex( ui.stylesCombo->findText(
+ getSettings()->value( "MainWindow/QtStyle", "" ).toString() ) );
+ ui.stylesCombo->insertSeparator( 1 );
+
+ CONNECT( ui.stylesCombo, currentIndexChanged( QString ), this, changeStyle( QString ) );
+ optionWidgets.append( ui.stylesCombo );
+#else
+ 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 ) );
+
+ InterfacePreviewWidget *preview = new InterfacePreviewWidget( this );
+ ( (QGridLayout *) ui.LooknfeelBox->layout() )->
+ addWidget( preview, 1, 0, 1, 2 );
+ CONNECT( ui.displayModeBox, currentIndexChanged( int ),
+ preview, setPreview( int ) );
CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel,
displayModeBox );
CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
ui.fileSkin, ui.skinBrowse );
+ CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox );
CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
artFetcher );
CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox );
CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL,
updatesDays );
+ ui.updatesDays->setEnabled( ui.updatesBox->isChecked() );
CONNECT( ui.updatesBox, toggled( bool ),
ui.updatesDays, setEnabled( bool ) );
#else
CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
EnqueueOneInterfaceMode );
+ ui.EnqueueOneInterfaceMode->setEnabled( ui.OneInterfaceMode->isChecked() );
+ CONNECT( ui.OneInterfaceMode, toggled( bool ),
+ ui.EnqueueOneInterfaceMode, setEnabled( bool ) );
#else
ui.OneInterfaceBox->hide();
#endif
encoding );
CONFIG_GENERIC( "sub-language", String, ui.subLangLabel,
preferredLanguage );
- CONFIG_GENERIC_FILE( "freetype-font", File, ui.fontLabel, ui.font,
- ui.fontBrowse );
+ CONFIG_GENERIC_NO_BOOL( "freetype-font", Font, ui.fontLabel, font );
CONFIG_GENERIC( "freetype-color", IntegerList, ui.fontColorLabel,
fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList,
panel->setLayout( gLayout );
int line = 0;
+ panel_label->setText( qtr( "Configure Hotkeys" ) );
control = new KeySelectorControl( VLC_OBJECT(p_intf), p_config ,
this, gLayout, line );
+ controls.append( control );
- panel_label->setText( qtr( "Configure Hotkeys" ) );
+ line++;
+
+ QFrame *sepline = new QFrame;
+ sepline->setFrameStyle(QFrame::HLine | QFrame::Sunken);
+ gLayout->addWidget( sepline, line, 0, 1, -1 );
+
+ line++;
+
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "hotkeys-mousewheel-mode" );
+ control = new IntegerListConfigControl( VLC_OBJECT(p_intf),
+ p_config, false, this, gLayout, line );
controls.append( control );
break;
panel_layout->addWidget( panel_label );
panel_layout->addWidget( title_line );
- panel_layout->addWidget( panel );
- if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 );
+
+ if( small )
+ {
+ QScrollArea *scroller= new QScrollArea;
+ scroller->setWidget( panel );
+ scroller->setWidgetResizable( true );
+ scroller->setFrameStyle( QFrame::NoFrame );
+ panel_layout->addWidget( scroller );
+ }
+ else
+ {
+ panel_layout->addWidget( panel );
+ if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 );
+ }
setLayout( panel_layout );
+
+#undef END_SPREFS_CAT
+#undef START_SPREFS_CAT
+#undef CONFIG_GENERIC_FILE
+#undef CONFIG_GENERIC_NO_BOOL
+#undef CONFIG_GENERIC2
+#undef CONFIG_GENERIC
}
+
void SPrefsPanel::updateAudioOptions( int number)
{
QString value = qobject_cast<QComboBox *>(optionWidgets[audioOutCoB])
optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#endif
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
+ optionWidgets[spdifChB]->setVisible( ( value != "aout_file"
+ && value != "dummy" ) );
}
CaC( "dvdnav-caching" );
CaC( "tcp-caching" ); CaC( "vcd-caching" );
CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" );
- CaC( "screen-caching" );
+ CaC( "screen-caching" ); CaC( "bd-caching" );
CaCi( "rtsp-caching", 2 ); CaCi( "ftp-caching", 2 );
CaCi( "http-caching", 2 );
if (module_exists ("access_realrtsp" ))
//CaCi( "dv-caching" ) too short...
}
break;
+#undef CaC
+#undef CaCi
}
/* Interfaces */
config_PutPsz( p_intf, "intf", "skins2" );
if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
config_PutPsz( p_intf, "intf", "qt" );
+ if( qobject_cast<QComboBox *>(optionWidgets[styleCB]) )
+ getSettings()->setValue( "MainWindow/QtStyle",
+ qobject_cast<QComboBox *>(optionWidgets[styleCB])->currentText() );
+
break;
}
config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
}
+void SPrefsPanel::changeStyle( QString s_style )
+{
+ QApplication::setStyle( s_style );
+
+ /* force refresh on all widgets */
+ QWidgetList widgets = QApplication::allWidgets();
+ QWidgetList::iterator it = widgets.begin();
+ while( it != widgets.end() ) {
+ (*it)->update();
+ it++;
+ };
+}
+
#ifdef WIN32
#include <QDialogButtonBox>
#include <QHeaderView>
#include "util/registry.hpp"
+#include <string>
bool SPrefsPanel::addType( const char * psz_ext, QTreeWidgetItem* current,
QTreeWidgetItem* parent, QVLCRegistry *qvReg )
void SPrefsPanel::assoDialog()
{
+ OSVERSIONINFO winVer;
+ winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ //Vista specific file associations
+ if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
+ {
+ LPAPPASSOCREGUI p_appassoc;
+ CoInitialize( 0 );
+
+ if( S_OK == CoCreateInstance( &clsid_IApplication2,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_IApplicationAssociationRegistrationUI,
+ (void **)&p_appassoc) )
+ {
+ if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )
+ {
+ CoUninitialize();
+ return;
+ }
+ }
+
+ CoUninitialize();
+ }
QDialog *d = new QDialog( this );
QGridLayout *assoLayout = new QGridLayout( d );
Qt::Checked : Qt::PartiallyChecked )
: Qt::Unchecked );
+#undef aTo
+#undef aTv
+#undef aTa
+
QDialogButtonBox *buttonBox = new QDialogButtonBox( d );
QPushButton *closeButton = new QPushButton( qtr( "&Apply" ) );
QPushButton *clearButton = new QPushButton( qtr( "&Cancel" ) );
projects / vlc / blobdiff