/*****************************************************************************
* 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 <QListWidget>
-#include <QListWidgetItem>
#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 <assert.h>
-
-#include "pixmaps/hotkeys_50x50.xpm"
-#include "pixmaps/audio_50x50.xpm"
-#include "pixmaps/input_and_codecs_50x50.xpm"
-#include "pixmaps/interface_50x50.xpm"
-#include "pixmaps/subtitles_50x50.xpm"
-#include "pixmaps/video_50x50.xpm"
#include "ui/sprefs_audio.h"
#include "ui/sprefs_input.h"
#include "ui/sprefs_hotkeys.h"
#include "ui/sprefs_interface.h"
-#define ITEM_HEIGHT 50
+#define ICON_HEIGHT 64
+#define BUTTON_HEIGHT 74
/*********************************************************************
* The List of categories
*********************************************************************/
SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
- QListWidget( _parent ), p_intf( _p_intf )
+ QWidget( _parent ), p_intf( _p_intf )
{
- setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
- setAlternatingRowColors( true );
- setViewMode(QListView::IconMode);
- setMaximumWidth(200);
-
-#define ADD_CATEGORY( id, label, icon ) \
- addItem( label ); \
- item( id )->setIcon( QIcon( QPixmap( icon ) ) ); \
- item( id )->setData( Qt::UserRole, qVariantFromValue( (int)id ) ); \
- item( id )->setTextAlignment(Qt::AlignHCenter); \
- item( id )->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-
- ADD_CATEGORY( SPrefsVideo, qtr("Video"), video_50x50_xpm );
- ADD_CATEGORY( SPrefsAudio, qtr("Audio"), audio_50x50_xpm );
+ QVBoxLayout *layout = new QVBoxLayout();
+
+ QButtonGroup *buttonGroup = new QButtonGroup( this );
+ buttonGroup->setExclusive ( true );
+ CONNECT( buttonGroup, buttonClicked ( int ),
+ this, switchPanel( int ) );
+
+#define ADD_CATEGORY( button, label, icon, numb ) \
+ QToolButton * button = new QToolButton( this ); \
+ button->setIcon( QIcon( ":/pixmaps/" #icon ) ); \
+ button->setIconSize( QSize( ICON_HEIGHT , ICON_HEIGHT ) ); \
+ button->setText( label ); \
+ button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon ); \
+ button->resize( BUTTON_HEIGHT , BUTTON_HEIGHT); \
+ button->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding) ; \
+ button->setAutoRaise( true ); \
+ button->setCheckable( true ); \
+ buttonGroup->addButton( button, numb ); \
+ 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 );
+ ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"),
+ spref_cone_Subtitles_64.png, 3 );
ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
- input_and_codecs_50x50_xpm );
- ADD_CATEGORY( SPrefsInterface, qtr("Interface"), interface_50x50_xpm );
- ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles"), subtitles_50x50_xpm );
- ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), hotkeys_50x50_xpm );
+ spref_cone_Input_64.png, 4 );
+ ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
+
+ SPrefsInterface->setChecked( true );
+ layout->setMargin( 0 );
+ layout->setSpacing( 1 );
+
+ this->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
+ setLayout( layout );
- setCurrentRow( SPrefsInterface );
+}
+
+void SPrefsCatList::switchPanel( int i )
+{
+ emit currentItemChanged( i );
}
/*********************************************************************
controls.append( control ); \
}
-
-
#define START_SPREFS_CAT( name , label ) \
case SPrefs ## name: \
{ \
QVBoxLayout *panel_layout = new QVBoxLayout();
QWidget *panel = new QWidget();
+ panel_layout->setMargin( 3 );
// Title Label
QLabel *panel_label = new QLabel;
QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
- labelFont.setPointSize( labelFont.pointSize() + 4 );
- labelFont.setBold( true );
+ 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) );
+ italicFont.setItalic( true );
+
switch( number )
{
/* 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 );
#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,
+ 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
- CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
+// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
+ CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
volNormalizer );
CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
END_SPREFS_CAT;
/* Input and Codecs Panel Implementation */
START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings" );
/* Disk Devices */
-/* CONFIG_GENERIC( );*/
+/* CONFIG_GENERIC( );*/ //FIXME
CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
/* Caching */
-/* CONFIG_GENERIC( );*/
+/* CONFIG_GENERIC( );*/ //FIXME
CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel );
CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair );
END_SPREFS_CAT;
/* Interface Panel */
- START_SPREFS_CAT( Interface, "Interfaces settings" );
+ START_SPREFS_CAT( Interface, "Interface settings" );
+ ui.defaultLabel->setFont( italicFont );
+ ui.skinsLabel->setFont( italicFont );
+#if defined( WIN32 ) || defined (__APPLE__)
CONFIG_GENERIC( "language", StringList, NULL, language );
-#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
- ui.OneInterfaceBox->hide();
+#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( "subsdec-encoding", StringList, NULL, encoding );
CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
-
- CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
- fontBrowse );
+ CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
+ fontBrowse );
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
fontSize );
END_SPREFS_CAT;
START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" );
+ //FIMXE
END_SPREFS_CAT;
}
void SPrefsPanel::clean()
{}
+
projects / vlc / blobdiff