X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fcomplete_preferences.cpp;h=7f209d346ce00ccc601efbd0c0bcc1dd59656e6a;hb=e5d0cd4f13d7f0c835c8ef425f59ddc416f2bb68;hp=462b36851808587a60d55606cef54005e79c5efc;hpb=48cc5bef59a44e2239c8828993ca36fad234db0d;p=vlc diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp index 462b368518..7f209d346c 100644 --- a/modules/gui/qt4/components/complete_preferences.cpp +++ b/modules/gui/qt4/components/complete_preferences.cpp @@ -20,6 +20,9 @@ * 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 #include @@ -39,20 +42,11 @@ #include "components/complete_preferences.hpp" #include "components/preferences_widgets.hpp" -#include "qt4.hpp" #include #include #include -#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 /********************************************************************* @@ -68,14 +62,14 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : setTextElideMode( Qt::ElideNone ); setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn ); -#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b##_xpm )) - BI( audio, audio ); - BI( video, video ); - BI( input, codec ); - BI( sout, type_net ); - BI( advanced, advanced ); - BI( playlist, type_playlist ); - BI( interface, intf ); +#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" ); #undef BI /* Build the tree for the main module */ @@ -88,27 +82,31 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : assert (i < (unsigned)p_list->i_count); const module_t *p_main = (module_t *)p_list->p_values[i].p_object; - if( strcmp( p_main->psz_object_name, "main" ) == 0 ) + if( strcmp( module_GetObjName( p_main ), "main" ) == 0 ) p_module = p_main; } 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; - char *psz_help; + module_config_t *p_item = p_config + i; + + const 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 + data->name = QString( qtr( config_CategoryNameGet ( p_item->value.i ) ) ); psz_help = config_CategoryHelpGet( p_item->value.i ); if( psz_help ) - data->help = QString( qfu(psz_help) ); + data->help = QString( qtr(psz_help) ); else data->help.clear(); data->i_type = TYPE_CATEGORY; @@ -137,6 +135,8 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : 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 || @@ -149,23 +149,24 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : // 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( + data->name = QString( qtr( config_CategoryNameGet( p_item->value.i )) ); psz_help = config_CategoryHelpGet( p_item->value.i ); if( psz_help ) - data->help = QString( qfu(psz_help) ); + data->help = QString( qtr(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( + data->name = QString( qtr( config_CategoryNameGet( p_item->value.i)) ); psz_help = config_CategoryHelpGet( p_item->value.i ); if( psz_help ) - data->help = QString( qfu(psz_help) ); + data->help = QString( qtr(psz_help) ); else data->help.clear(); data->i_type = TYPE_SUBCATEGORY; @@ -184,6 +185,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : break; } } + module_PutConfig (p_config); /* Build the tree of plugins */ for( int i_index = 0; i_index < p_list->i_count; i_index++ ) @@ -191,17 +193,15 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : p_module = (module_t *)p_list->p_values[i_index].p_object; // Main module excluded - if( !strcmp( p_module->psz_object_name, "main" ) ) continue; - - /* Exclude submodules; they have no config options of their own */ - if( p_module->b_submodule ) continue; + if( !strcmp( module_GetObjName( p_module ), "main" ) ) 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; @@ -214,6 +214,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : 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; @@ -250,17 +251,12 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : 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( 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; + module_data->psz_name = strdup( module_GetObjName( p_module ) ); module_data->help.clear(); // TODO image QTreeWidgetItem *module_item = new QTreeWidgetItem(); - module_item->setText( 0, qfu( p_module->psz_shortname ? - p_module->psz_shortname : p_module->psz_object_name) ); + module_item->setText( 0, qtr( module_GetName( p_module, VLC_FALSE ) ) ); //item->setIcon( 0 , XXX ); module_item->setData( 0, Qt::UserRole, QVariant::fromValue( module_data) ); @@ -334,10 +330,10 @@ void PrefsTree::doAll( bool doclean ) /********************************************************************* * 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 ) { @@ -346,20 +342,17 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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 ) { @@ -375,6 +368,7 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, } } + /* Widgets now */ global_layout = new QVBoxLayout(); global_layout->setMargin( 2 ); QString head; @@ -389,23 +383,31 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, } else { - head = QString( qfu(p_module->psz_longname) ); - if( p_module->psz_help ) + const char *psz_help = module_GetHelp (p_module); + head = QString( qtr( module_GetLongName( p_module ) ) ); + if( psz_help ) { help.append( "\n" ); - help.append( qfu( p_module->psz_help ) ); + help.append( qtr( psz_help ) ); } } - QLabel *label = new QLabel( head ); - global_layout->addWidget( label ); - QFont myFont = QApplication::font( static_cast(0) ); - myFont.setPointSize( myFont.pointSize() + 3 ); myFont.setBold( true ); - label->setFont( myFont ); + QLabel *titleLabel = new QLabel( head ); + QFont titleFont = QApplication::font( static_cast(0) ); + titleFont.setPointSize( titleFont.pointSize() + 6 ); + titleFont.setFamily( "Verdana" ); + titleLabel->setFont( titleFont ); + + // Title
+ QFrame *title_line = new QFrame; + title_line->setFrameShape(QFrame::HLine); + title_line->setFrameShadow(QFrame::Sunken); QLabel *helpLabel = new QLabel( help, this ); helpLabel->setWordWrap( true ); + global_layout->addWidget( titleLabel ); + global_layout->addWidget( title_line ); global_layout->addWidget( helpLabel ); QGroupBox *box = NULL; @@ -435,10 +437,10 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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( qfu(p_item->psz_text) ); + box = new QGroupBox( qtr( p_item->psz_text ) ); boxlayout = new QGridLayout(); } /* Only one hotkey control */ @@ -459,13 +461,6 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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 ); @@ -479,10 +474,10 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, 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 ); @@ -492,7 +487,7 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, setLayout( global_layout ); } -void PrefsPanel::apply() +void AdvPrefsPanel::apply() { QList::Iterator i; for( i = controls.begin() ; i != controls.end() ; i++ ) @@ -501,5 +496,5 @@ void PrefsPanel::apply() c->doApply( p_intf ); } } -void PrefsPanel::clean() +void AdvPrefsPanel::clean() {}