Commit 7cf4df92 authored by Antoine Cellerier's avatar Antoine Cellerier

preferences_widgets.*: Bool prefs widget

simple_preferences.cpp: Audio simple preferences category
parent f293fd7b
...@@ -84,6 +84,18 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, ...@@ -84,6 +84,18 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this,
p_control = new IntegerConfigControl( p_this, p_item, parent, p_control = new IntegerConfigControl( p_this, p_item, parent,
l, line ); l, line );
break; break;
case CONFIG_ITEM_FILE:
fprintf( stderr, "Todo\n" );
break;
case CONFIG_ITEM_BOOL:
p_control = new BoolConfigControl( p_this, p_item, parent, l, line );
break;
case CONFIG_ITEM_FLOAT:
if( p_item->f_min || p_item->f_max )
fprintf( stderr, "Todo\n" );
else
fprintf( stderr, "Todo\n" );
break;
default: default:
break; break;
} }
...@@ -372,3 +384,47 @@ int IntegerListConfigControl::getValue() ...@@ -372,3 +384,47 @@ int IntegerListConfigControl::getValue()
{ {
return combo->itemData( combo->currentIndex() ).toInt(); return combo->itemData( combo->currentIndex() ).toInt();
} }
/*********** Boolean **************/
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QWidget *_parent, QGridLayout *l,
int line ) :
VIntConfigControl( _p_this, _p_item, _parent )
{
checkbox = new QCheckBox( qfu(p_item->psz_text) );
finish();
if( !l )
{
QHBoxLayout *layout = new QHBoxLayout();
layout->addWidget( checkbox, 0 );
widget->setLayout( layout );
}
else
{
l->addWidget( checkbox, line, 0 );
}
}
BoolConfigControl::BoolConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item,
QLabel *_label,
QCheckBox *_checkbox,
bool bycat ) :
VIntConfigControl( _p_this, _p_item )
{
checkbox = _checkbox;
finish();
}
void BoolConfigControl::finish()
{
checkbox->setCheckState( p_item->i_value == VLC_TRUE ? Qt::Checked
: Qt::Unchecked );
checkbox->setToolTip( qfu(p_item->psz_longtext) );
}
int BoolConfigControl::getValue()
{
return checkbox->checkState() == Qt::Checked ? VLC_TRUE : VLC_FALSE;
}
...@@ -29,15 +29,11 @@ ...@@ -29,15 +29,11 @@
#include <QLineEdit> #include <QLineEdit>
#include <QSpinBox> #include <QSpinBox>
#include <QComboBox> #include <QComboBox>
#include <QCheckBox>
#include "ui/input_stats.h" #include "ui/input_stats.h"
#include "qt4.hpp" #include "qt4.hpp"
#include <assert.h> #include <assert.h>
class QSpinBox;
class QString;
class QComboBox;
class QCheckBox;
class ConfigControl : public QObject class ConfigControl : public QObject
{ {
Q_OBJECT; Q_OBJECT;
...@@ -122,17 +118,21 @@ private: ...@@ -122,17 +118,21 @@ private:
QComboBox *combo; QComboBox *combo;
}; };
#if 0
class BoolConfigControl : public VIntConfigControl class BoolConfigControl : public VIntConfigControl
{ {
public: public:
IntConfigControl( vlc_object_t *, module_config_t *, QWidget * ); BoolConfigControl( vlc_object_t *, module_config_t *, QWidget *,
virtual ~IntConfigControl(); QGridLayout *, int );
BoolConfigControl( vlc_object_t *, module_config_t *,
QLabel *, QCheckBox*, bool );
virtual ~BoolConfigControl() {};
virtual int getValue(); virtual int getValue();
virtual void show() { checkbox->show(); }
virtual void hide() { checkbox->hide(); }
private: private:
wxCheckBox *checkbox; QCheckBox *checkbox;
void finish();
}; };
#endif
/******************************************************* /*******************************************************
* Float-based controls * Float-based controls
......
...@@ -133,9 +133,30 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -133,9 +133,30 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
switch( number ) switch( number )
{ {
START_SPREFS_CAT( Video ); START_SPREFS_CAT( Video );
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( "vout", Module, NULL, outputModule );
CONFIG_GENERIC( "snapshot-path", String, NULL,
snapshotsDirectory ); /* FIXME -> use file instead of string */
CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
snapshotsSequentialNumbering );
CONFIG_GENERIC( "snapshot-format", StringList, NULL,
snapshotsFormat );
END_SPREFS_CAT; END_SPREFS_CAT;
START_SPREFS_CAT( Audio ); START_SPREFS_CAT( Audio );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
END_SPREFS_CAT; END_SPREFS_CAT;
case SPrefsInputAndCodecs: break; case SPrefsInputAndCodecs: break;
...@@ -149,7 +170,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -149,7 +170,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding ); CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
CONFIG_GENERIC( "sub-language", String, NULL, preferedLanguage ); CONFIG_GENERIC( "sub-language", String, NULL, preferedLanguage );
CONFIG_GENERIC( "freetype-font", String, NULL, font ); CONFIG_GENERIC( "freetype-font", String, NULL, font ); /* FIXME -> use file instead of string */
CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor ); CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL, CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
fontSize ); fontSize );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment