Layout fixes in COPYING (and use spaces instead of tabs). Use a fixed width font...

[vlc] / modules / gui / qt4 / dialogs / help.cpp

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index d9861ae6c370816eec4eef26dbb9fbd9f6e2d752..3d787da834d682b2e9d46d7a5e43ea96bf2f5f3b 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * Help.cpp : Help and About dialogs
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- * $Id: Messages.cpp 16024 2006-07-13 13:51:05Z xtophe $
+ * Copyright (C) 2007 the VideoLAN team
+ * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
  *
@@ -22,27 +22,34 @@
  *****************************************************************************/
 
 #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(450, 500);
+    resize( 600, 560 );
 
-    QGridLayout *layout = new QGridLayout(this);
-    QTextBrowser *helpBrowser = new QTextBrowser(this);
-    QPushButton *closeButton = new QPushButton(qtr("&Close"));
+    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 );
 
-    layout->addWidget(helpBrowser, 0, 0, 1, 0);
-    layout->addWidget(closeButton, 1, 3);
+    layout->addWidget( helpBrowser, 0, 0, 1, 0 );
+    layout->addWidget( closeButton, 1, 3 );
 
     BUTTONACT( closeButton, close() );
 }
@@ -60,14 +67,83 @@ AboutDialog *AboutDialog::instance = NULL;
 AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 {
     setWindowTitle( qtr( "About" ) );
-    resize( 450, 250 );
+    resize( 600, 500 );
 
     QGridLayout *layout = new QGridLayout( this );
     QTabWidget *tab = new QTabWidget( this );
+
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
-    
-    layout->addWidget( tab, 0, 0); 
-    layout->addWidget( closeButton, 1, 3 );
+    closeButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
+    closeButton->setDefault( true );
+
+    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 */
+    QTextEdit *licenseEdit = new QTextEdit( this );
+    licenseEdit->setFontFamily( "Monospace" );
+    licenseEdit->setText( qfu( psz_license ) );
+    licenseEdit->setReadOnly( true );
+
+    /* People who helped */
+    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( 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( infoWidget, qtr( "General Info" ) );
+    tab->addTab( authorsEdit, qtr( "Authors" ) );
+    tab->addTab( thanksWidget, qtr("Thanks") );
+    tab->addTab( licenseEdit, qtr("Distribution License") );
+
     BUTTONACT( closeButton, close() );
 }