* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <QApplication>
#include <QLabel>
setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
- BI( audio, ":/pixmaps/vlc_advprefs_audio.png" );
- BI( video, ":/pixmaps/vlc_advprefs_video.png" );
- BI( input, ":/pixmaps/vlc_advprefs_codec.png" );
- BI( sout, ":/pixmaps/vlc_advprefs_sout.png" );
- BI( advanced, ":/pixmaps/vlc_advprefs_extended.png" );
- BI( playlist, ":/pixmaps/vlc_advprefs_playlist.png" );
- BI( interface, ":/pixmaps/vlc_advprefs_intf.png" );
+ 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" );
#undef BI
/* Build the tree for the main module */
PrefsItemData *data = NULL;
QTreeWidgetItem *current_item = NULL;
- for (size_t i = 0; i < p_module->confsize; i++)
+ unsigned confsize;
+ module_config_t *const p_config = module_GetConfig (p_module, &confsize);
+
+ for (size_t i = 0; i < confsize; i++)
{
- const module_config_t *p_item = p_module->p_config + i;
+ module_config_t *p_item = p_config + i;
+
const char *psz_help;
QIcon icon;
switch( p_item->i_type )
break;
case CONFIG_SUBCATEGORY:
if( p_item->value.i == -1 ) break;
+
+ /* Special cases: move the main subcategories to the parent cat*/
if( data &&
( p_item->value.i == SUBCAT_VIDEO_GENERAL ||
p_item->value.i == SUBCAT_ADVANCED_MISC ||
QVariant::fromValue( data ) );
continue;
}
+
data = new PrefsItemData();
data->name = QString( qtr( config_CategoryNameGet(
p_item->value.i)) );
break;
}
}
+ module_PutConfig (p_config);
/* Build the tree of plugins */
for( int i_index = 0; i_index < p_list->i_count; i_index++ )
// Main module excluded
if( !strcmp( module_GetObjName( p_module ), "main" ) ) continue;
- /* Exclude submodules; they have no config options of their own */
- if( p_module->b_submodule ) continue;
-
- unsigned 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);
- for (size_t i = 0; i < p_module->confsize; i++)
+ for (size_t i = 0; i < confsize; i++)
{
- const module_config_t *p_item = p_module->p_config + i;
+ const module_config_t *p_item = p_config + i;
if( p_item->i_type == CONFIG_CATEGORY )
i_category = p_item->value.i;
if( b_options && i_category && i_subcategory )
break;
}
+ module_PutConfig (p_config);
if( !b_options || i_category == 0 || i_subcategory == 0 ) continue;
// Locate the category item;
if( !b_found ) continue;
PrefsItemData *module_data = new PrefsItemData();
- module_data->b_submodule = p_module->b_submodule;
module_data->i_type = TYPE_MODULE;
module_data->psz_name = strdup( module_GetObjName( p_module ) );
- module_data->i_object_id = p_module->b_submodule ?
- ((module_t *)p_module->p_parent)->i_object_id :
- p_module->i_object_id;
module_data->help.clear();
// TODO image
QTreeWidgetItem *module_item = new QTreeWidgetItem();
/*********************************************************************
* The Panel
*********************************************************************/
-PrefsPanel::PrefsPanel( QWidget *_parent ) : QWidget( _parent )
+AdvPrefsPanel::AdvPrefsPanel( QWidget *_parent ) : QWidget( _parent )
{}
-PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
+AdvPrefsPanel::AdvPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
PrefsItemData * data ) :
QWidget( _parent ), p_intf( _p_intf )
{
if( data->i_type == TYPE_CATEGORY )
return;
else if( data->i_type == TYPE_MODULE )
- p_module = (module_t *) vlc_object_get( p_intf, data->i_object_id );
+ p_module = module_Find( VLC_OBJECT(p_intf), data->psz_name );
else
{
- p_module = config_FindModule( VLC_OBJECT(p_intf), "main" );
+ p_module = module_Find( VLC_OBJECT(p_intf), "main" );
assert( p_module );
- vlc_object_yield( p_module );
}
- 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;
+ unsigned confsize;
+ module_config_t *const p_config = module_GetConfig (p_module, &confsize),
+ *p_item = p_config,
+ *p_end = p_config + confsize;
if( data->i_type == TYPE_SUBCATEGORY || data->i_type == TYPE_CATSUBCAT )
{
}
else
{
+ const char *psz_help = module_GetHelp (p_module);
head = QString( qtr( module_GetLongName( p_module ) ) );
- if( p_module->psz_help )
+ if( psz_help )
{
help.append( "\n" );
- help.append( qtr( module_GetHelp( p_module ) ) );
+ help.append( qtr( psz_help ) );
}
}
if( box )
{
box->setLayout( boxlayout );
- layout->addWidget( box, i_line, 0, 1, 2 );
+ 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 ) );
boxlayout = new QGridLayout();
}
/* Only one hotkey control */
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 );
if( box )
{
box->setLayout( boxlayout );
- layout->addWidget( box, i_line, 0, 1, 2 );
+ layout->addWidget( box, i_line, 0, 1, -1 );
}
- vlc_object_release( p_module );
+ module_Put( p_module );
scrolled_area->setSizePolicy( QSizePolicy::Preferred,QSizePolicy::Fixed );
scrolled_area->setLayout( layout );
setLayout( global_layout );
}
-void PrefsPanel::apply()
+void AdvPrefsPanel::apply()
{
QList<ConfigControl *>::Iterator i;
for( i = controls.begin() ; i != controls.end() ; i++ )
c->doApply( p_intf );
}
}
-void PrefsPanel::clean()
+void AdvPrefsPanel::clean()
{}
projects / vlc / blobdiff