Makes THANKS & COPYING built in in qt4 about dialog

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index ad563a23b6c9a7a9d1def68006b1c7d7a8387366..9adcc1ba7b8be97dd9c7e75fab94ac4231abcfbd 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -75,6 +75,17 @@ resources.cpp: res.qrc
        sed -i -e 's/Q_(\"_(\\\"\(.*\)\\\")"/Q_("\1"/' $@.tmp
        mv -f $@.tmp $@
 
+dialogs/help.cpp: dialogs/about.hpp
+
+dialogs/about.hpp:
+       echo "char *psz_licence = { \\" > dialogs/about.hpp
+       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\" \\" }' >> dialogs/about.hpp
+       echo "};" >> 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
+
+
 SOURCES_qt4 =  qt4.cpp \
                menus.cpp \
                main_interface.cpp \
@@ -119,6 +130,7 @@ noinst_HEADERS = \
        dialogs/preferences.hpp \
        dialogs/interaction.hpp \
        dialogs/sout.hpp \
+        dialogs/about.hpp \
        dialogs/help.hpp \
        dialogs/gototime.hpp \
        dialogs/open.hpp \

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index c5a24e8834b9faafe2871e14147180c5d7f4eb71..f1bb9f1b7573155fcef2540fee6df2b4928c9049 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "dialogs/about.hpp"
 #include "dialogs/help.hpp"
 
 #include "dialogs_provider.hpp"
@@ -31,6 +32,7 @@
 #include <QTabWidget>
 #include <QFile>
 #include <QLabel>
+#include <QString>
 
 HelpDialog *HelpDialog::instance = NULL;
 
@@ -80,15 +82,15 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     layout->addWidget( closeButton, 2, 1, 1, 1 );
 
     /* GPL License */
-    QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" );
     QTextEdit *licenseEdit = new QTextEdit( this );
-    licenseEdit->setText( licenseFile->readAll() );
+    QString psz_qlicence = QString::fromUtf8( psz_licence );
+    licenseEdit->setText( psz_qlicence );
     licenseEdit->setReadOnly( true );
 
     /* People who helped */
-    QFile *thanksFile = new QFile( "/usr/src/vlc/THANKS" );
     QTextEdit *thanksEdit = new QTextEdit( this );
-    thanksEdit->setText( thanksFile->readAll() );
+    QString psz_qthanks = QString::fromUtf8( psz_thanks );
+    thanksEdit->setText( psz_qthanks );
     thanksEdit->setReadOnly( true );
 
     /* add the tabs to the Tabwidget */