X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=3d787da834d682b2e9d46d7a5e43ea96bf2f5f3b;hb=bfd706067e935775fdb23af2104043b0b722694b;hp=96e907438b3522da2c312eefc13603231612990d;hpb=fa0c3cd517645df1e57cdb0ddecdd4f3b22bfebe;p=vlc

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 96e907438b..3d787da834 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -2,7 +2,7 @@
  * Help.cpp : Help and About dialogs
  ****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
- * $Id: Messages.cpp 16024 2006-07-13 13:51:05Z xtophe $
+ * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
  *
@@ -22,25 +22,29 @@
  *****************************************************************************/
 
 #include "dialogs/help.hpp"
+#include <vlc_about.h>
 
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
+
+#include <vlc_intf_strings.h>
 
 #include <QTextBrowser>
 #include <QTabWidget>
 #include <QFile>
 #include <QLabel>
+#include <QString>
 
 HelpDialog *HelpDialog::instance = NULL;
 
-HelpDialog::HelpDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
+HelpDialog::HelpDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
 {
     setWindowTitle( qtr( "Help" ) );
-    resize( 600, 500 );
+    resize( 600, 560 );
 
     QGridLayout *layout = new QGridLayout( this );
     QTextBrowser *helpBrowser = new QTextBrowser( this );
+    helpBrowser->setOpenExternalLinks( true );
+    helpBrowser->setHtml( I_LONGHELP );
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
     closeButton->setDefault( true );
 
@@ -72,28 +76,72 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     closeButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
     closeButton->setDefault( true );
 
-    QLabel *introduction = new QLabel( qtr( "Infos 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 );
+    QLabel *introduction = new QLabel(
+            qtr( "Information about VLC media player." ) );
+    QLabel *iconVLC = new QLabel;
+    iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) );
+    layout->addWidget( iconVLC, 0, 0, 1, 1 );
+    layout->addWidget( introduction, 0, 1, 1, 7 );
+    layout->addWidget( tab, 1, 0, 1, 8 );
+    layout->addWidget( closeButton, 2, 6, 1, 2 );
+
+    /* Main Introduction */
+    QWidget *infoWidget = new QWidget( this );
+    QHBoxLayout *infoLayout = new QHBoxLayout( infoWidget );
+    QLabel *infoLabel = new QLabel( "VLC media player " PACKAGE_VERSION "\n\n"
+            "(c) 1996-2007 - the VideoLAN Team\n\n" +
+            qtr( "VLC media player is a free media player, made by the "
+                "VideoLAN Team.\nIt is a standalone multimedia player, "
+                "encoder and streamer, that can read from many supports "
+                "(files, CDs, DVDs, networks, capture cards...) and that "
+                "works on many platforms.\n\n" )
+            + qtr( "You are using the new Qt4 Interface.\n" )
+            + qtr( "Compiled by " ) + qfu( VLC_CompileBy() )+ "@"
+            + qfu( VLC_CompileDomain() ) + ".\n"
+            + "Compiler: " + qfu( VLC_Compiler() ) +".\n"
+            + qtr( "Based on SVN revision: " ) + qfu( VLC_Changeset() )
+            + ".\n\n"
+            + qtr( "This program comes with NO WARRANTY, to the extent "
+                "permitted by the law; read the distribution tab.\n\n" )
+            + "The VideoLAN team <videolan@videolan.org> \n"
+              "http://www.videolan.org/\n") ;
+    infoLabel->setWordWrap( infoLabel );
+
+    QLabel *iconVLC2 = new QLabel;
+    iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) );
+    infoLayout->addWidget( iconVLC2 );
+    infoLayout->addWidget( infoLabel );
 
     /* GPL License */
-    QFile *licenseFile = new QFile( "/usr/src/vlc/COPYING" );
     QTextEdit *licenseEdit = new QTextEdit( this );
-    licenseEdit->setText( licenseFile->readAll() );
+    licenseEdit->setFontFamily( "Monospace" );
+    licenseEdit->setText( qfu( psz_license ) );
     licenseEdit->setReadOnly( true );
 
     /* People who helped */
-    QFile *thanksFile = new QFile( "/usr/src/vlc/THANKS" );
+    QWidget *thanksWidget = new QWidget( this );
+    QVBoxLayout *thanksLayout = new QVBoxLayout( thanksWidget );
+
+    QLabel *thanksLabel = new QLabel( qtr("We would like to thank the whole "
+                "community, the testers, our users and the following people "
+                "(and the missing ones...) for their collaboration to "
+                "provide the best software." ) );
+    thanksLabel->setWordWrap( true );
+    thanksLayout->addWidget( thanksLabel );
     QTextEdit *thanksEdit = new QTextEdit( this );
-    thanksEdit->setText( thanksFile->readAll() );
+    thanksEdit->setText( qfu( psz_thanks ) );
     thanksEdit->setReadOnly( true );
+    thanksLayout->addWidget( thanksEdit );
+
+    /* People who wrote the software */
+    QTextEdit *authorsEdit = new QTextEdit( this );
+    authorsEdit->setText( qfu( psz_authors ) );
+    authorsEdit->setReadOnly( true );
 
     /* add the tabs to the Tabwidget */
-    tab->addTab( NULL, _( "Information" ) );
-    tab->addTab( NULL, _( "Authors" ) );
-    tab->addTab( thanksEdit, qtr("Thanks") );
+    tab->addTab( infoWidget, qtr( "General Info" ) );
+    tab->addTab( authorsEdit, qtr( "Authors" ) );
+    tab->addTab( thanksWidget, qtr("Thanks") );
     tab->addTab( licenseEdit, qtr("Distribution License") );
 
     BUTTONACT( closeButton, close() );