* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "components/preferences.hpp"
-#include "components/preferences_widgets.hpp"
-#include "qt4.hpp"
-#include <vlc_config_cat.h>
-#include <vlc_intf_strings.h>
-#include <assert.h>
-#include "pixmaps/audio.xpm"
-#include "pixmaps/video.xpm"
-#include "pixmaps/type_net.xpm"
-#include "pixmaps/type_playlist.xpm"
-#include "pixmaps/advanced.xpm"
-#include "pixmaps/codec.xpm"
-#include "pixmaps/intf.xpm"
#include <QApplication>
#include <QLabel>
#include <QTreeWidget>
#include <QHBoxLayout>
#include <QGridLayout>
#include <QHeaderView>
-
#include <QPalette>
#include <QColor>
+#include "components/preferences.hpp"
+#include "components/preferences_widgets.hpp"
+#include "qt4.hpp"
+
+#include <vlc_config_cat.h>
+#include <vlc_intf_strings.h>
+#include <assert.h>
+
+#include "pixmaps/audio.xpm"
+#include "pixmaps/video.xpm"
+#include "pixmaps/type_net.xpm"
+#include "pixmaps/type_playlist.xpm"
+#include "pixmaps/advanced.xpm"
+#include "pixmaps/codec.xpm"
+#include "pixmaps/intf.xpm"
+
#define ITEM_HEIGHT 25
/*********************************************************************
PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
QTreeWidget( _parent ), p_intf( _p_intf )
{
- module_t *p_module;
- vlc_list_t *p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE,
- FIND_ANYWHERE );
- if( !p_list ) return;
-
setColumnCount( 1 );
- setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
setAlternatingRowColors( true );
header()->hide();
-
- QFont myFont = QApplication::font(0);
- myFont.setPointSize( myFont.pointSize() + 3 ); myFont.setBold( true );
+ setIconSize( QSize( ITEM_HEIGHT,ITEM_HEIGHT ) );
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b##_xpm ))
BI( audio, audio );
#undef BI
/* Build the tree for the main module */
- int i_index;
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ 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( int i_index = 0; p_module == NULL; i_index++ )
{
+ assert (i_index < p_list->i_count);
+
p_module = (module_t *)p_list->p_values[i_index].p_object;
- if( !strcmp( p_module->psz_object_name, "main" ) )
- break;
+ if( strcmp( p_module->psz_object_name, "main" ) )
+ p_module = NULL;
}
- if( i_index < p_list->i_count )
+
+ PrefsItemData *data = NULL;
+ QTreeWidgetItem *current_item = NULL;
+ for (size_t i = 0; i < p_module->confsize; i++)
{
- module_config_t *p_item = p_module->p_config;
- PrefsItemData *data = NULL;
- QTreeWidgetItem *current_item = NULL;
- if( p_item ) do
+ module_config_t *p_item = p_module->p_config + i;
+ char *psz_help;
+ QIcon icon;
+ switch( p_item->i_type )
{
- char *psz_help;
- QIcon icon;
- switch( p_item->i_type )
+ case CONFIG_CATEGORY:
+ if( p_item->value.i == -1 ) break;
+ data = new PrefsItemData();
+ data->name = QString( qfu( config_CategoryNameGet
+ ( p_item->value.i ) ) );
+ psz_help = config_CategoryHelpGet( p_item->value.i );
+ if( psz_help )
+ data->help = QString( qfu(psz_help) );
+ else
+ data->help.clear();
+ data->i_type = TYPE_CATEGORY;
+ data->i_object_id = p_item->value.i;
+
+ switch( p_item->value.i )
{
- case CONFIG_CATEGORY:
- if( p_item->i_value == -1 ) break;
- data = new PrefsItemData();
- data->name = QString( qfu( config_CategoryNameGet
- ( p_item->i_value ) ) );
- psz_help = config_CategoryHelpGet( p_item->i_value );
- if( psz_help )
- data->help = QString( qfu(psz_help) );
- else
- data->help.clear();
- data->i_type = TYPE_CATEGORY;
- data->i_object_id = p_item->i_value;
-
- switch( p_item->i_value )
- {
#define CI(a,b) case a: icon = b##_icon;break
- CI( CAT_AUDIO, audio );
- CI( CAT_VIDEO, video );
- CI( CAT_INPUT, input );
- CI( CAT_SOUT, sout );
- CI( CAT_ADVANCED, advanced );
- CI( CAT_PLAYLIST, playlist );
- CI( CAT_INTERFACE, interface );
+ CI( CAT_AUDIO, audio );
+ CI( CAT_VIDEO, video );
+ CI( CAT_INPUT, input );
+ CI( CAT_SOUT, sout );
+ CI( CAT_ADVANCED, advanced );
+ CI( CAT_PLAYLIST, playlist );
+ CI( CAT_INTERFACE, interface );
#undef CI
- }
+ }
- current_item = new QTreeWidgetItem();
- current_item->setText( 0, data->name );
- current_item->setIcon( 0 , icon );
- current_item->setData( 0, Qt::UserRole,
- qVariantFromValue( data ) );
- addTopLevelItem( current_item );
- break;
- case CONFIG_SUBCATEGORY:
- if( p_item->i_value == -1 ) break;
- if( data &&
- ( p_item->i_value == SUBCAT_VIDEO_GENERAL ||
- p_item->i_value == SUBCAT_ADVANCED_MISC ||
- p_item->i_value == SUBCAT_INPUT_GENERAL ||
- p_item->i_value == SUBCAT_INTERFACE_GENERAL ||
- p_item->i_value == SUBCAT_SOUT_GENERAL||
- p_item->i_value == SUBCAT_PLAYLIST_GENERAL||
- p_item->i_value == SUBCAT_AUDIO_GENERAL ) )
- {
- // Data still contains the correct thing
- data->i_type = TYPE_CATSUBCAT;
- data->i_subcat_id = p_item->i_value;
- data->name = QString( qfu( config_CategoryNameGet(
- p_item->i_value )) );
- psz_help = config_CategoryHelpGet( p_item->i_value );
- if( psz_help )
- data->help = QString( qfu(psz_help) );
- else
- data->help.clear();
- current_item->setData( 0, Qt::UserRole,
- QVariant::fromValue( data ) );
- continue;
- }
- data = new PrefsItemData();
- data->name = QString( qfu( config_CategoryNameGet(
- p_item->i_value)) );
- psz_help = config_CategoryHelpGet( p_item->i_value );
+ current_item = new QTreeWidgetItem();
+ current_item->setText( 0, data->name );
+ current_item->setIcon( 0 , icon );
+ current_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+ current_item->setData( 0, Qt::UserRole,
+ qVariantFromValue( data ) );
+ addTopLevelItem( current_item );
+ break;
+ case CONFIG_SUBCATEGORY:
+ if( p_item->value.i == -1 ) break;
+ if( data &&
+ ( p_item->value.i == SUBCAT_VIDEO_GENERAL ||
+ p_item->value.i == SUBCAT_ADVANCED_MISC ||
+ p_item->value.i == SUBCAT_INPUT_GENERAL ||
+ p_item->value.i == SUBCAT_INTERFACE_GENERAL ||
+ p_item->value.i == SUBCAT_SOUT_GENERAL||
+ p_item->value.i == SUBCAT_PLAYLIST_GENERAL||
+ p_item->value.i == SUBCAT_AUDIO_GENERAL ) )
+ {
+ // Data still contains the correct thing
+ data->i_type = TYPE_CATSUBCAT;
+ data->i_subcat_id = p_item->value.i;
+ data->name = QString( qfu( config_CategoryNameGet(
+ p_item->value.i )) );
+ psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
data->help = QString( qfu(psz_help) );
else
data->help.clear();
- data->i_type = TYPE_SUBCATEGORY;
- data->i_object_id = p_item->i_value;
-
- assert( current_item );
-
- /* TODO : Choose the image */
- QTreeWidgetItem *subcat_item = new QTreeWidgetItem();
- subcat_item->setText( 0, data->name );
- //item->setIcon( 0 , XXX );
- subcat_item->setData( 0, Qt::UserRole,
- qVariantFromValue(data) );
- subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
- current_item->addChild( subcat_item );
- break;
+ current_item->setData( 0, Qt::UserRole,
+ QVariant::fromValue( data ) );
+ continue;
}
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
+ data = new PrefsItemData();
+ data->name = QString( qfu( config_CategoryNameGet(
+ p_item->value.i)) );
+ psz_help = config_CategoryHelpGet( p_item->value.i );
+ if( psz_help )
+ data->help = QString( qfu(psz_help) );
+ else
+ data->help.clear();
+ data->i_type = TYPE_SUBCATEGORY;
+ data->i_object_id = p_item->value.i;
+
+ assert( current_item );
+
+ /* TODO : Choose the image */
+ QTreeWidgetItem *subcat_item = new QTreeWidgetItem();
+ subcat_item->setText( 0, data->name );
+ //item->setIcon( 0 , XXX );
+ subcat_item->setData( 0, Qt::UserRole,
+ qVariantFromValue(data) );
+ subcat_item->setSizeHint( 0, QSize( -1, ITEM_HEIGHT ) );
+ current_item->addChild( subcat_item );
+ break;
+ }
}
/* Build the tree of plugins */
for( int i_index = 0; i_index < p_list->i_count; i_index++ )
{
- module_config_t *p_item;
int i_subcategory = -1, i_category = -1, i_options = 0;
p_module = (module_t *)p_list->p_values[i_index].p_object;
* are stored in the parent module) */
if( p_module->b_submodule ) continue;
- p_item = p_module->p_config;
- if( !p_item ) continue;
+ for (size_t i = 0; i < p_module->confsize; i++)
+ {
+ module_config_t *p_item = p_module->p_config + i;
- do {
if( p_item->i_type == CONFIG_CATEGORY )
- i_category = p_item->i_value;
+ i_category = p_item->value.i;
else if( p_item->i_type == CONFIG_SUBCATEGORY )
- i_subcategory = p_item->i_value;
+ i_subcategory = p_item->value.i;
if( p_item->i_type & CONFIG_ITEM )
i_options++;
if( i_options > 0 && i_category >= 0 && i_subcategory >= 0 )
break;
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-
+ }
if( !i_options ) continue; // Nothing to display
// Locate the category item;
PrefsItemData *module_data = new PrefsItemData();
module_data->b_submodule = p_module->b_submodule;
module_data->i_type = TYPE_MODULE;
+ module_data->psz_name = strdup( p_module->psz_object_name );
module_data->i_object_id = p_module->b_submodule ?
((module_t *)p_module->p_parent)->i_object_id :
p_module->i_object_id;
doAll( true );
}
-/// \todo When cleaning, we should remove the panel ?
void PrefsTree::doAll( bool doclean )
{
for( int i_cat_index = 0 ; i_cat_index < topLevelItemCount();
{}
PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
- PrefsItemData * data, bool currently_advanced ) :
+ PrefsItemData * data ) :
QWidget( _parent ), p_intf( _p_intf )
{
- module_config_t *p_item;
-
/* Find our module */
module_t *p_module = NULL;
if( data->i_type == TYPE_CATEGORY )
p_module = (module_t *) vlc_object_get( p_intf, data->i_object_id );
else
{
- /* List the plugins */
- int i_index;
- vlc_bool_t b_found = VLC_FALSE;
- vlc_list_t *p_list = vlc_list_find( p_intf,
- VLC_OBJECT_MODULE, FIND_ANYWHERE );
- if( !p_list ) return;
-
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
- {
- p_module = (module_t *)p_list->p_values[i_index].p_object;
- if( !strcmp( p_module->psz_object_name, "main" ) )
- {
- b_found = VLC_TRUE;
- break;
- }
- }
- if( !p_module && !b_found )
- {
- msg_Warn( p_intf, "unable to create preferences (main not found)");
- return;
- }
- if( p_module ) vlc_object_yield( p_module );
- vlc_list_release( p_list );
+ p_module = config_FindModule( VLC_OBJECT(p_intf), "main" );
+ assert( p_module );
+ vlc_object_yield( p_module );
}
- if( p_module->b_submodule )
- p_item = ((module_t *)p_module->p_parent)->p_config;
- else
- p_item = p_module->p_config;
+ module_t *p_realmodule = p_module->b_submodule
+ ? (module_t *)(p_module->p_parent)
+ : p_module;
+
+ module_config_t *p_item = p_realmodule->p_config;
+ module_config_t *p_end = p_item + p_realmodule->confsize;
if( data->i_type == TYPE_SUBCATEGORY || data->i_type == TYPE_CATSUBCAT )
{
- do
+ while (p_item < p_end)
{
if( p_item->i_type == CONFIG_SUBCATEGORY &&
( data->i_type == TYPE_SUBCATEGORY &&
- p_item->i_value == data->i_object_id ) ||
+ p_item->value.i == data->i_object_id ) ||
( data->i_type == TYPE_CATSUBCAT &&
- p_item->i_value == data->i_subcat_id ) )
+ p_item->value.i == data->i_subcat_id ) )
break;
- if( p_item->i_type == CONFIG_HINT_END ) break;
- } while( p_item++ );
+ p_item++;
+ }
}
global_layout = new QVBoxLayout();
QLabel *label = new QLabel( head );
global_layout->addWidget( label );
- QFont myFont = QApplication::font(0);
+ QFont myFont = QApplication::font( static_cast<QWidget*>(0) );
myFont.setPointSize( myFont.pointSize() + 3 ); myFont.setBold( true );
label->setFont( myFont );
QGridLayout *layout = new QGridLayout();
int i_line = 0, i_boxline = 0;
+ bool has_hotkey = false;
if( p_item ) do
{
if( ( ( data->i_type == TYPE_SUBCATEGORY &&
- p_item->i_value != data->i_object_id ) ||
+ p_item->value.i != data->i_object_id ) ||
( data->i_type == TYPE_CATSUBCAT &&
- p_item->i_value != data->i_subcat_id ) ) &&
+ p_item->value.i != data->i_subcat_id ) ) &&
( p_item->i_type == CONFIG_CATEGORY ||
p_item->i_type == CONFIG_SUBCATEGORY ) )
break;
box = new QGroupBox( qfu(p_item->psz_text) );
boxlayout = new QGridLayout();
}
+ /* Only one hotkey control */
+ if( has_hotkey && p_item->i_type & CONFIG_ITEM && p_item->psz_name &&
+ strstr( p_item->psz_name, "key-" ) )
+ continue;
+ if( p_item->i_type & CONFIG_ITEM && p_item->psz_name &&
+ strstr( p_item->psz_name, "key-" ) )
+ has_hotkey = true;
ConfigControl *control;
if( ! box )
control = ConfigControl::createControl( VLC_OBJECT( p_intf ),
p_item, NULL, boxlayout, i_boxline );
if( !control )
- {
continue;
+
+ if( has_hotkey )
+ {
+ /* A hotkey widget takes 2 lines */
+ if( box ) i_boxline ++;
+ else i_line++;
}
+
if( box ) i_boxline++;
else i_line++;
controls.append( control );
}
- while( !(p_item->i_type == CONFIG_HINT_END ||
- ( ( data->i_type == TYPE_SUBCATEGORY ||
+ while( !( ( data->i_type == TYPE_SUBCATEGORY ||
data->i_type == TYPE_CATSUBCAT ) &&
( p_item->i_type == CONFIG_CATEGORY ||
- p_item->i_type == CONFIG_SUBCATEGORY ) ) ) && p_item++ );
+ p_item->i_type == CONFIG_SUBCATEGORY ) )
+ && ( ++p_item < p_end ) );
if( box )
{
void PrefsPanel::apply()
{
- /* todo */
QList<ConfigControl *>::Iterator i;
for( i = controls.begin() ; i != controls.end() ; i++ )
{
ConfigControl *c = qobject_cast<ConfigControl *>(*i);
- switch( c->getType() )
- {
- case 1:
- {
- VIntConfigControl *vicc = qobject_cast<VIntConfigControl *>(*i);
- config_PutInt( p_intf, vicc->getName(), vicc->getValue() );
- break;
- }
- case 2:
- {
- VFloatConfigControl *vfcc = qobject_cast<VFloatConfigControl *>(*i);
- config_PutFloat( p_intf, vfcc->getName(), vfcc->getValue() );
- break;
- }
- case 3:
- {
- VStringConfigControl *vscc =
- qobject_cast<VStringConfigControl *>(*i);
- config_PutPsz( p_intf, vscc->getName(), qta( vscc->getValue() ) );
- }
- }
+ c->doApply( p_intf );
}
}
-
void PrefsPanel::clean()
{}
projects / vlc / blobdiff