Qt4 - help: add AUTHORS to the tabs

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 9a73944f128fd8c8edfd8e049340e00774d3f0a1..e12901010f4df93ee7f3f24198782ff30f7ad406 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -85,6 +85,9 @@ dialogs/about.hpp:
        echo "char *psz_thanks = { \\" >> dialogs/about.hpp
        cat $(top_srcdir)/THANKS | grep -v '$$Id:' | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\" \\" }' >> dialogs/about.hpp
        echo "};" >> dialogs/about.hpp
+       echo "char *psz_authors = { \\" >> dialogs/about.hpp
+       cat $(top_srcdir)/AUTHORS | grep -v '$$Id:' | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\" \\" }' >> dialogs/about.hpp
+       echo "};" >> dialogs/about.hpp
 
 
 SOURCES_qt4 =  qt4.cpp \

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index acb8582514037b436d6326b82b0d0d64188d657d..a3e87cdcedce4a53d1d31643f5e2177e99624c72 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -79,9 +79,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     QLabel *introduction = new QLabel(
             qtr( "Information about VLC media player" ) );
 
-    layout->addWidget( introduction, 0, 0, 1, 2 );
-    layout->addWidget( tab, 1, 0, 1, 2 );
-    layout->addWidget( closeButton, 2, 1, 1, 1 );
+    layout->addWidget( introduction, 0, 0, 1, 4 );
+    layout->addWidget( tab, 1, 0, 1, 4 );
+    layout->addWidget( closeButton, 2, 3, 1, 1 );
 
     /* GPL License */
     QTextEdit *licenseEdit = new QTextEdit( this );
@@ -93,9 +93,14 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     thanksEdit->setText( qfu( psz_thanks ) );
     thanksEdit->setReadOnly( true );
 
+    /* People who helped */
+    QTextEdit *authorsEdit = new QTextEdit( this );
+    authorsEdit->setText( qfu( psz_authors ) );
+    authorsEdit->setReadOnly( true );
+
     /* add the tabs to the Tabwidget */
     tab->addTab( NULL, qtr( "General Info" ) );
-    tab->addTab( NULL, qtr( "Authors" ) );
+    tab->addTab( authorsEdit, qtr( "Authors" ) );
     tab->addTab( thanksEdit, qtr("Thanks") );
     tab->addTab( licenseEdit, qtr("Distribution License") );