Changeset 7440827a7f8064269e74394895ec0c6073778490

Timestamp:

09/01/07 19:43:49 (10 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1188668629 +0000

git-parent:

[17acf7977fd1d5587140e686b62a62dce1e55dc9]

git-author:

Rafaël Carré <funman@videolan.org> 1188668629 +0000

Message:

qt4: Fix help dialog (again)
Uses builtin AUTHORS THANKS and COPYING files on every platform
Don't ship AUTHORS.txt and THANKS.txt on windows packages
COPYING.txt is kept since it's used in the nsis installer
Only show authors' name instead of the full AUTHORS file
Removes an empty line in THANKS to make it easier to parse without using endless pipes

Files:

• Makefile.am (modified) (1 diff)
• THANKS (modified) (1 diff)
• modules/gui/qt4/Modules.am (modified) (1 diff)
• modules/gui/qt4/dialogs/help.cpp (modified) (3 diffs)

Makefile.am

@@ -620 +620 @@
-    cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/"
-
-AUTHORS MAINTAINERS THANK
+MAINTAINER
-      do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
-      unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done

THANKS

@@ -1 +1 @@
-$Id$
-
-VLC makes extensive use of the following persons' code:
-

modules/gui/qt4/Modules.am

@@ -83 +83 @@
-    mkdir -p -- dialogs
-    echo "/* Automatically generated file - DO NOT EDIT */" > dialogs/about.hpp.tmp
-c
+s
-    cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | awk '{ print "\""$$0"\\n\"" }' >> dialogs/about.hpp.tmp
-    echo ";" >> dialogs/about.hpp.tmp
-    echo "static const char psz_thanks[] =" >> dialogs/about.hpp.tmp
-cat $(top_srcdir)/THANKS | grep -v '$$Id:'
+grep -v '$$Id:'  $(top_srcdir)/THANKS
-    echo ";" >> dialogs/about.hpp.tmp
-    echo "static const char psz_authors[] =" >> dialogs/about.hpp.tmp
-cat $(top_srcdir)/AUTHORS | grep -v '$$Id:'
+grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2-
-    echo ";" >> dialogs/about.hpp.tmp
-    mv -f -- dialogs/about.hpp.tmp dialogs/about.hpp

modules/gui/qt4/dialogs/help.cpp

@@ -115 +115 @@
-    /* GPL License */
-    QTextEdit *licenseEdit = new QTextEdit( this );
-#ifdef WIN32
-    QFile *licenseFile = new QFile( "COPYING.txt" );
-    licenseFile->open( QIODevice::ReadOnly | QIODevice::Text );
-    licenseEdit->setText( licenseFile->readAll().data() );
-    licenseFile->close();
-#else
-    char *psz_license = LICENCE;
-    licenseEdit->setText( qfu( psz_license ) );
-#endif
-    licenseEdit->setReadOnly( true );
-
@@ -137 +129 @@
-    thanksLayout->addWidget( thanksLabel );
-    QTextEdit *thanksEdit = new QTextEdit( this );
-#ifdef WIN32
-    QFile *thanksFile = new QFile( "THANKS.txt" );
-    thanksFile->open( QIODevice::ReadOnly | QIODevice::Text );
-    thanksEdit->setText( thanksFile->readAll().data() );
-    thanksFile->close();
-#else
-    char *psz_thanks = THANKS;
-    thanksEdit->setText( qfu( psz_thanks ) );
-#endif
-    thanksEdit->setReadOnly( true );
-    thanksLayout->addWidget( thanksEdit );
@@ -151 +135 @@
-    /* People who wrote the software */
-    QTextEdit *authorsEdit = new QTextEdit( this );
-#ifdef WIN32
-    QFile *authorsFile = new QFile( "COPYING.txt" );
-    authorsFile->open( QIODevice::ReadOnly | QIODevice::Text );
-    authorsEdit->setText( authorsFile->readAll().data() );
-    authorsFile->close();
-#else
-    char *psz_authors = AUTHORS;
-    authorsEdit->setText( qfu( psz_authors ) );
-#endif
-    authorsEdit->setReadOnly( true );
-