Commit 5ca8805a authored by Clément Stenac's avatar Clément Stenac

Add support for modules help strings (Closes:#413)

parent a8fcedd2
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
p_module->psz_object_name = MODULE_STRING; \ p_module->psz_object_name = MODULE_STRING; \
p_module->psz_shortname = NULL; \ p_module->psz_shortname = NULL; \
p_module->psz_longname = MODULE_STRING; \ p_module->psz_longname = MODULE_STRING; \
p_module->psz_help = NULL; \
p_module->pp_shortcuts[ 0 ] = MODULE_STRING; \ p_module->pp_shortcuts[ 0 ] = MODULE_STRING; \
p_module->i_cpu = 0; \ p_module->i_cpu = 0; \
p_module->psz_program = NULL; \ p_module->psz_program = NULL; \
...@@ -185,6 +186,9 @@ ...@@ -185,6 +186,9 @@
#define set_description( desc ) \ #define set_description( desc ) \
p_submodule->psz_longname = desc p_submodule->psz_longname = desc
#define set_help( help ) \
p_submodule->psz_help = help
#define set_capability( cap, score ) \ #define set_capability( cap, score ) \
p_submodule->psz_capability = cap; \ p_submodule->psz_capability = cap; \
p_submodule->i_score = score p_submodule->i_score = score
......
...@@ -57,7 +57,6 @@ $Id$ ...@@ -57,7 +57,6 @@ $Id$
* dirac: BBC Dirac codec * dirac: BBC Dirac codec
* directfb: Direct Framebuffer video output * directfb: Direct Framebuffer video output
* directory : input module to read files in a directory * directory : input module to read files in a directory
* distort: miscellaneous image effects filter.
* dmo: a DirectMediaObject decoder that uses DirectMedia to decode video (WMV3) * dmo: a DirectMediaObject decoder that uses DirectMedia to decode video (WMV3)
* dolby_surround_decoder: simple decoder for dolby surround encoded streams * dolby_surround_decoder: simple decoder for dolby surround encoded streams
* dshow: DirectShow access plugin for encoding cards under Windows * dshow: DirectShow access plugin for encoding cards under Windows
...@@ -132,11 +131,10 @@ $Id$ ...@@ -132,11 +131,10 @@ $Id$
* libmpeg2: Mpeg2 video decoder using libmpeg2 * libmpeg2: Mpeg2 video decoder using libmpeg2
* linear_resampler: linear audio resampler * linear_resampler: linear audio resampler
* lirc: Linux infrared control module * lirc: Linux infrared control module
* livedotcom: rtp demux based on liveMedia (live.com) * live555: rtp demux based on liveMedia (live555.com)
* logger: file logger plugin * logger: file logger plugin
* logo: video filter to put a logo on the video * logo: video filter to put a logo on the video
* lpcm: LPCM decoder * lpcm: LPCM decoder
* m3u: PLS, M3U, ASX and B4S playlist parser
* m4a: MPEG-4 Audio Stream demuxer * m4a: MPEG-4 Audio Stream demuxer
* m4v: MPEG-4 Video Stream demuxer * m4v: MPEG-4 Video Stream demuxer
* macosx: Video output, and interface module for Mac OS X. * macosx: Video output, and interface module for Mac OS X.
...@@ -218,7 +216,6 @@ $Id$ ...@@ -218,7 +216,6 @@ $Id$
* screen: a input module that takes screenshots of the primary monitor * screen: a input module that takes screenshots of the primary monitor
* screensaver: screensaver disabling module * screensaver: screensaver disabling module
* sdl_image: SDL-based image decoder * sdl_image: SDL-based image decoder
* sgimb: SGIMB referrer files parser
* shout: Shoutcast services discovery * shout: Shoutcast services discovery
* showintf: shows the main interface * showintf: shows the main interface
* simple_channel_mixer: channel mixer * simple_channel_mixer: channel mixer
......
...@@ -71,6 +71,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *, ...@@ -71,6 +71,7 @@ static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
vlc_module_begin(); vlc_module_begin();
set_description( N_("Headphone virtual spatialization effect") ); set_description( N_("Headphone virtual spatialization effect") );
set_shortname( _("Headphone effect") ); set_shortname( _("Headphone effect") );
set_help( MODULE_DESCRIPTION );
set_category( CAT_AUDIO ); set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AFILTER ); set_subcategory( SUBCAT_AUDIO_AFILTER );
......
...@@ -384,7 +384,14 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -384,7 +384,14 @@ PrefsPanel::PrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
p_item++; // Why that ? p_item++; // Why that ?
} }
else else
head = QString( p_module->psz_longname ); {
head = QString( qfu(p_module->psz_longname) );
if( p_module->psz_help )
{
head.append( "\n" );
head.append( qfu( p_module->psz_help ) );
}
}
QLabel *label = new QLabel( head, this ); QLabel *label = new QLabel( head, this );
QFont font = label->font(); QFont font = label->font();
......
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