#include <QGroupBox>
#include <QScrollArea>
#include <QVBoxLayout>
-#include <QHBoxLayout>
#include <QGridLayout>
#include <QHeaderView>
-#include <QPalette>
-#include <QColor>
#include "components/complete_preferences.hpp"
#include "components/preferences_widgets.hpp"
PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
QTreeWidget( _parent ), p_intf( _p_intf )
{
+ /* General Qt options */
setColumnCount( 1 );
setAlternatingRowColors( true );
header()->hide();
+
setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
setTextElideMode( Qt::ElideNone );
- setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
+ /* Nice icons */
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
- BI( audio, ":/pixmaps/advprefs_audio.png" );
- BI( video, ":/pixmaps/advprefs_video.png" );
- BI( input, ":/pixmaps/advprefs_codec.png" );
- BI( sout, ":/pixmaps/advprefs_sout.png" );
- BI( advanced, ":/pixmaps/advprefs_extended.png" );
- BI( playlist, ":/pixmaps/advprefs_playlist.png" );
- BI( interface, ":/pixmaps/advprefs_intf.png" );
+ BI( audio, ":/prefsmenu/advanced/audio" );
+ BI( video, ":/prefsmenu/advanced/video" );
+ BI( input, ":/prefsmenu/advanced/codec" );
+ BI( sout, ":/prefsmenu/advanced/sout" );
+ BI( advanced, ":/prefsmenu/advanced/extended" );
+ BI( playlist, ":/prefsmenu/advanced/playlist" );
+ BI( interface, ":/prefsmenu/advanced/intf" );
#undef BI
/* Build the tree for the main module */
- const module_t *p_module = NULL;
- vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
- FIND_ANYWHERE );
- if( !p_list ) return;
- for( unsigned i = 0; p_module == NULL; i++ )
- {
- assert (i < (unsigned)p_list->i_count);
-
- const module_t *p_main = (module_t *)p_list->p_values[i].p_object;
- if( strcmp( module_GetObjName( p_main ), "main" ) == 0 )
- p_module = p_main;
- }
+ module_t *p_module = module_get_main();
+ /* Initialisation and get the confsize */
PrefsItemData *data = NULL;
+ PrefsItemData *data_sub = NULL;
QTreeWidgetItem *current_item = NULL;
unsigned confsize;
- module_config_t *const p_config = module_GetConfig (p_module, &confsize);
+ module_config_t *const p_config = module_config_get (p_module, &confsize);
- for (size_t i = 0; i < confsize; i++)
+ /* Go through the list of conf */
+ for( size_t i = 0; i < confsize; i++ )
{
- module_config_t *p_item = p_config + i;
-
const char *psz_help;
QIcon icon;
+
+ /* Work on a new item */
+ module_config_t *p_item = p_config + i;
+
switch( p_item->i_type )
{
+ /* This is a category */
case CONFIG_CATEGORY:
if( p_item->value.i == -1 ) break;
+
+ /* PrefsItemData Init */
data = new PrefsItemData();
- data->name = QString( qtr( config_CategoryNameGet
- ( p_item->value.i ) ) );
+ data->name = qtr( config_CategoryNameGet( p_item->value.i ) );
psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
- data->help = QString( qtr(psz_help) );
+ data->help = qtr( psz_help );
else
data->help.clear();
data->i_type = TYPE_CATEGORY;
data->i_object_id = p_item->value.i;
+ /* This is a category, put a nice icon */
switch( p_item->value.i )
{
#define CI(a,b) case a: icon = b##_icon;break
CI( CAT_ADVANCED, advanced );
CI( CAT_PLAYLIST, playlist );
CI( CAT_INTERFACE, interface );
-#undef CI
}
+#undef CI
+ /* Create a new QTreeItem to display it in the tree at top level */
current_item = new QTreeWidgetItem();
current_item->setText( 0, data->name );
current_item->setIcon( 0 , icon );
qVariantFromValue( data ) );
addTopLevelItem( current_item );
break;
+
+ /* This is a subcategory */
case CONFIG_SUBCATEGORY:
if( p_item->value.i == -1 ) break;
p_item->value.i == SUBCAT_PLAYLIST_GENERAL||
p_item->value.i == SUBCAT_AUDIO_GENERAL ) )
{
- // Data still contains the correct thing
+ /* Data still contains the correct thing */
data->i_type = TYPE_CATSUBCAT;
data->i_subcat_id = p_item->value.i;
- data->name = QString( qtr( config_CategoryNameGet(
- p_item->value.i )) );
+ data->name = qtr( config_CategoryNameGet( p_item->value.i ) );
psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
- data->help = QString( qtr(psz_help) );
+ data->help = qtr( psz_help );
else
data->help.clear();
current_item->setData( 0, Qt::UserRole,
continue;
}
- data = new PrefsItemData();
- data->name = QString( qtr( config_CategoryNameGet(
- p_item->value.i)) );
+ /* Normal Subcategories */
+
+ /* Process the Data */
+ data_sub = new PrefsItemData();
+ data_sub->name = qtr( config_CategoryNameGet( p_item->value.i) );
psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
- data->help = QString( qtr(psz_help) );
+ data_sub->help = qtr( psz_help );
else
- data->help.clear();
- data->i_type = TYPE_SUBCATEGORY;
- data->i_object_id = p_item->value.i;
+ data_sub->help.clear();
+ data_sub->i_type = TYPE_SUBCATEGORY;
+ data_sub->i_object_id = p_item->value.i;
- assert( current_item );
-
- /* TODO : Choose the image */
+ /* Create a new TreeWidget */
QTreeWidgetItem *subcat_item = new QTreeWidgetItem();
- subcat_item->setText( 0, data->name );
- //item->setIcon( 0 , XXX );
+ subcat_item->setText( 0, data_sub->name );
subcat_item->setData( 0, Qt::UserRole,
- qVariantFromValue(data) );
+ qVariantFromValue( data_sub ) );
subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+
+ /* Add it to the parent */
+ assert( current_item );
current_item->addChild( subcat_item );
break;
+
+ /* Other items don't need yet a place on the tree */
}
}
- module_PutConfig (p_config);
+ module_config_free( p_config );
+ module_release( p_module );
+
+ module_t **p_list = module_list_get( NULL );
/* Build the tree of plugins */
- for( int i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( size_t i = 0; (p_module = p_list[i]) != NULL; i++ )
{
- p_module = (module_t *)p_list->p_values[i_index].p_object;
-
// Main module excluded
- if( !strcmp( module_GetObjName( p_module ), "main" ) ) continue;
+ if( module_is_main( p_module) ) continue;
+
+ unsigned confsize;
+ int i_subcategory = 0, i_category = 0;
- unsigned i_subcategory = 0, i_category = 0, confsize;
bool b_options = false;
- module_config_t *const p_config = module_GetConfig (p_module, &confsize);
+ module_config_t *const p_config = module_config_get (p_module, &confsize);
+ /* Loop through the configurations items */
for (size_t i = 0; i < confsize; i++)
{
const module_config_t *p_item = p_config + i;
if( b_options && i_category && i_subcategory )
break;
}
- module_PutConfig (p_config);
+ module_config_free (p_config);
+
+ /* Dummy item, please proceed */
if( !b_options || i_category == 0 || i_subcategory == 0 ) continue;
+
// Locate the category item;
QTreeWidgetItem *subcat_item = NULL;
bool b_found = false;
+
for( int i_cat_index = 0 ; i_cat_index < topLevelItemCount();
i_cat_index++ )
{
+ /* Get the treeWidgetItem that correspond to the category */
QTreeWidgetItem *cat_item = topLevelItem( i_cat_index );
PrefsItemData *data = cat_item->data( 0, Qt::UserRole ).
value<PrefsItemData *>();
+
+ /* If we match the good category */
if( data->i_object_id == i_category )
{
for( int i_sc_index = 0; i_sc_index < cat_item->childCount();
PrefsItemData *module_data = new PrefsItemData();
module_data->i_type = TYPE_MODULE;
- module_data->psz_name = strdup( module_GetObjName( p_module ) );
+ module_data->psz_name = strdup( module_get_object( p_module ) );
module_data->help.clear();
- // TODO image
QTreeWidgetItem *module_item = new QTreeWidgetItem();
- module_item->setText( 0, qtr( module_GetName( p_module, VLC_FALSE ) ) );
- //item->setIcon( 0 , XXX );
+ module_item->setText( 0, qtr( module_get_name( p_module, false ) ) );
module_item->setData( 0, Qt::UserRole,
QVariant::fromValue( module_data) );
module_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
/* We got everything, just sort a bit */
sortItems( 0, Qt::AscendingOrder );
- vlc_list_release( p_list );
+ module_list_free( p_list );
}
PrefsTree::~PrefsTree() {}
if( data->i_type == TYPE_CATEGORY )
return;
else if( data->i_type == TYPE_MODULE )
- p_module = module_Find( VLC_OBJECT(p_intf), data->psz_name );
+ p_module = module_find( data->psz_name );
else
{
- p_module = module_Find( VLC_OBJECT(p_intf), "main" );
+ p_module = module_get_main();
assert( p_module );
}
unsigned confsize;
- module_config_t *const p_config = module_GetConfig (p_module, &confsize),
+ module_config_t *const p_config = module_config_get (p_module, &confsize),
*p_item = p_config,
*p_end = p_config + confsize;
{
while (p_item < p_end)
{
- if( p_item->i_type == CONFIG_SUBCATEGORY &&
- ( data->i_type == TYPE_SUBCATEGORY &&
+ if( p_item->i_type == CONFIG_SUBCATEGORY &&
+ ( ( data->i_type == TYPE_SUBCATEGORY &&
p_item->value.i == data->i_object_id ) ||
( data->i_type == TYPE_CATSUBCAT &&
- p_item->value.i == data->i_subcat_id ) )
+ p_item->value.i == data->i_subcat_id ) ) )
break;
p_item++;
}
}
else
{
- const char *psz_help = module_GetHelp (p_module);
+ const char *psz_help = module_get_help (p_module);
head = QString( qtr( module_GetLongName( p_module ) ) );
if( psz_help )
{
( p_item->i_type == CONFIG_CATEGORY ||
p_item->i_type == CONFIG_SUBCATEGORY ) )
break;
- if( p_item->b_internal == VLC_TRUE ) continue;
+ if( p_item->b_internal == true ) continue;
if( p_item->i_type == CONFIG_SECTION )
{
if( box )
{
box->setLayout( boxlayout );
+ box->show();
layout->addWidget( box, i_line, 0, 1, -1 );
i_line++;
}
- box = new QGroupBox( qtr( p_item->psz_text ) );
+ box = new QGroupBox( qtr( p_item->psz_text ), this );
+ box->hide();
boxlayout = new QGridLayout();
}
/* Only one hotkey control */
ConfigControl *control;
if( ! box )
control = ConfigControl::createControl( VLC_OBJECT( p_intf ),
- p_item, NULL, layout, i_line );
+ p_item, this, layout, i_line );
else
control = ConfigControl::createControl( VLC_OBJECT( p_intf ),
- p_item, NULL, boxlayout, i_boxline );
+ p_item, this, boxlayout, i_boxline );
if( !control )
continue;
if( box )
{
box->setLayout( boxlayout );
+ box->show();
layout->addWidget( box, i_line, 0, 1, -1 );
}
- module_Put( p_module );
+ module_release (p_module);
scrolled_area->setSizePolicy( QSizePolicy::Preferred,QSizePolicy::Fixed );
scrolled_area->setLayout( layout );
c->doApply( p_intf );
}
}
+
void AdvPrefsPanel::clean()
{}
+
+AdvPrefsPanel::~AdvPrefsPanel()
+{
+ qDeleteAll( controls ); controls.clear();
+}
+
projects / vlc / blobdiff