X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=99b4eefffb7f4aa5f0bbfab22730c50ff699bf1d;hb=8462c96dd88417db77c726c8ed290ef7f745f873;hp=44886269b7eee67cc3d7b3ce9286048274c424cf;hpb=48c2ac8c879a83c4f8737b978ca9c3232bb2e70d;p=vlc

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 44886269b7..99b4eefffb 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Jean-Baptiste Kempf <jb (at) videolan.org>
- *          Rémi Duraffort <ivoire (at) via.ecp.fr>
+ *          Rémi Duraffort <ivoire (at) via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include "dialogs/help.hpp"
 #include <vlc_about.h>
@@ -41,14 +45,18 @@
 #include <QLabel>
 #include <QString>
 #include <QDialogButtonBox>
+#include <QEvent>
+#include <QFileDialog>
+#include <QDate>
 
 
 HelpDialog *HelpDialog::instance = NULL;
 
 HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
+
 {
     setWindowTitle( qtr( "Help" ) );
-    resize( 600, 560 );
+    setMinimumSize( 250, 300 );
 
     QGridLayout *layout = new QGridLayout( this );
     QTextBrowser *helpBrowser = new QTextBrowser( this );
@@ -61,22 +69,27 @@ HelpDialog::HelpDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     layout->addWidget( closeButton, 1, 3 );
 
     BUTTONACT( closeButton, close() );
+    readSettings( "Help", QSize( 400, 450 ) );
 }
 
 HelpDialog::~HelpDialog()
 {
+    writeSettings( "Help" );
 }
+
 void HelpDialog::close()
 {
-    this->toggleVisible();
+    toggleVisible();
 }
 
 AboutDialog *AboutDialog::instance = NULL;
 
-AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
+AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
+            : QVLCDialog( parent, _p_intf )
 {
     setWindowTitle( qtr( "About" ) );
     resize( 600, 500 );
+    setMinimumSize( 600, 500 );
 
     QGridLayout *layout = new QGridLayout( this );
     QTabWidget *tab = new QTabWidget( this );
@@ -86,9 +99,12 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     closeButton->setDefault( true );
 
     QLabel *introduction = new QLabel(
-            qtr( "Information about VLC media player." ) );
+            qtr( "VLC media player" " " VERSION_MESSAGE ) );
     QLabel *iconVLC = new QLabel;
-    iconVLC->setPixmap( QPixmap( ":/vlc48.png" ) );
+    if( QDate::currentDate().dayOfYear() >= 354 )
+        iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
+    else
+        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 );
@@ -97,33 +113,32 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     /* 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() )+ "@"
+    QLabel *infoLabel = new QLabel(
+            qtr( "VLC media player is a free media player, "
+                "encoder and streamer that can read from files, "
+                "CDs, DVDs, network streams, capture cards and even more!\n"
+                "VLC uses its internal codecs and works on essentially every "
+                "popular platform.\n\n" )
+            + qtr( "This version of VLC was compiled by:\n " )
+            + qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "."
             + 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" );
+            + qtr( "Based on Git commit: " ) + qfu( VLC_Changeset() ) + ".\n"
+            + qtr( "You are using the Qt4 Interface.\n\n" )
+            + qtr( "Copyright (C) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
+            + "vlc@videolan.org, http://www.videolan.org" );
     infoLabel->setWordWrap( infoLabel );
 
     QLabel *iconVLC2 = new QLabel;
-    iconVLC2->setPixmap( QPixmap( ":/vlc128.png" ) );
+    if( QDate::currentDate().dayOfYear() >= 354 )
+        iconVLC2->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
+    else
+        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 );
 
@@ -132,9 +147,9 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     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 "
+                "VLC community, the testers, our users and the following people "
                 "(and the missing ones...) for their collaboration to "
-                "provide the best software." ) );
+                "create the best free software." ) );
     thanksLabel->setWordWrap( true );
     thanksLayout->addWidget( thanksLabel );
     QTextEdit *thanksEdit = new QTextEdit( this );
@@ -148,10 +163,10 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
     authorsEdit->setReadOnly( true );
 
     /* add the tabs to the Tabwidget */
-    tab->addTab( infoWidget, qtr( "General Info" ) );
+    tab->addTab( infoWidget, qtr( "About" ) );
     tab->addTab( authorsEdit, qtr( "Authors" ) );
     tab->addTab( thanksWidget, qtr("Thanks") );
-    tab->addTab( licenseEdit, qtr("Distribution License") );
+    tab->addTab( licenseEdit, qtr("License") );
 
     BUTTONACT( closeButton, close() );
 }
@@ -159,45 +174,86 @@ AboutDialog::AboutDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 AboutDialog::~AboutDialog()
 {
 }
+
 void AboutDialog::close()
 {
-    this->toggleVisible();
+    toggleVisible();
 }
 
 #ifdef UPDATE_CHECK
+
+/*****************************************************************************
+ * UpdateDialog
+ *****************************************************************************/
+/* callback to get information from the core */
+static void UpdateCallback( void *data, bool b_ret )
+{
+    UpdateDialog* UDialog = (UpdateDialog *)data;
+    QEvent* event;
+
+    if( b_ret )
+        event = new QEvent( (QEvent::Type)UDOkEvent );
+    else
+        event = new QEvent( (QEvent::Type)UDErrorEvent );
+
+    QApplication::postEvent( UDialog, event );
+}
+
 UpdateDialog *UpdateDialog::instance = NULL;
 
 UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
-    setWindowTitle( qtr( "Update" ) );
-    resize( 320, 120 );
+    setWindowTitle( qtr( "VLC media player updates" ) );
 
     QGridLayout *layout = new QGridLayout( this );
 
-    updateBrowser = new QTextBrowser( this );
-    updateBrowser->setOpenExternalLinks( true );
-    updateBrowser->setHtml( qtr( "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=\"utf-8\" /></head> \
-                                  <body><center>Push the update button to get the updates</center></body></html>" ) );
-    
-    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
-    QPushButton *updateButton = new QPushButton( qtr( "&Update List" ) );
+    QPushButton *closeButton = new QPushButton( qtr( "&Cancel" ) );
+    updateButton = new QPushButton( qtr( "&Recheck version" ) );
     updateButton->setDefault( true );
+
     QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal );
     buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole );
     buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
 
-    layout->addWidget( updateBrowser, 0, 0 );
-    layout->addWidget( buttonBox, 1, 0 );
+    updateLabelTop = new QLabel( qtr( "Checking for an update..." ) );
+    updateLabelTop->setWordWrap( true );
+    updateLabelTop->setMargin( 8 );
 
-    BUTTONACT( updateButton, updateOrUpload() );
+    updateLabelDown = new QLabel( qtr( "\nDo you want to download it?\n" ) );
+    updateLabelDown->setWordWrap( true );
+    updateLabelDown->hide();
+
+    updateText = new QTextEdit;
+    updateText->setAcceptRichText(false);
+    updateText->setTextInteractionFlags( Qt::TextSelectableByKeyboard|
+                                         Qt::TextSelectableByMouse);
+    updateText->setEnabled( false );
+
+    layout->addWidget( updateLabelTop, 0, 0 );
+    layout->addWidget( updateText, 1, 0 );
+    layout->addWidget( updateLabelDown, 2, 0 );
+    layout->addWidget( buttonBox, 3, 0 );
+
+    BUTTONACT( updateButton, UpdateOrDownload() );
     BUTTONACT( closeButton, close() );
 
-    p_update = update_New( _p_intf );
+    /* Create the update structure */
+    p_update = update_New( p_intf );
+    b_checked = false;
+
+    setMinimumSize( 300, 100 );
+    setMaximumSize( 400, 300 );
+
+    readSettings( "Update", QSize( 300, 100 ) );
+
+    /* Check for updates */
+    UpdateOrDownload();
 }
 
 UpdateDialog::~UpdateDialog()
 {
     update_Delete( p_update );
+    writeSettings( "Update" );
 }
 
 void UpdateDialog::close()
@@ -205,22 +261,84 @@ void UpdateDialog::close()
     toggleVisible();
 }
 
-void UpdateDialog::updateOrUpload()
+/* Check for updates */
+void UpdateDialog::UpdateOrDownload()
 {
-    update_Check( p_update );
-
-    if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer )
+    if( !b_checked )
     {
-        updateBrowser->setHtml( qtr( "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=\"utf-8\" /></head> \
-                                      <body><center><p>" ) + qtu( (QString)p_update->release.psz_desc ) +
-                                      qtr( "</p>You can download the latest version of VLC <a href=\"" ) +
-                                      qtu( (QString)p_update->release.psz_url ) + qtr( "\">here</a></center></body></html>" ) );
+        updateButton->setEnabled( false );
+        updateLabelTop->setText( qtr( "Launching an update request..." ) );
+        update_Check( p_update, UpdateCallback, this );
     }
     else
     {
-        updateBrowser->setHtml( "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=\"utf-8\" /></head> \
-                                 <body><center>You have the latest version of VLC.</center></body></html>" );
+        QString dest_dir = QFileDialog::getExistingDirectory( this,
+                                 qtr( "Select a directory..." ),
+                                 qfu( config_GetHomeDir() ) );
+
+        if( dest_dir != "" )
+        {
+            /*HACK: Qt4 isn't able to change the way OS deals with directories
+              names. Windows doesn't add an ending separator so we might add it.
+             */
+            #if defined( WIN32 ) || defined( UNDER_CE )
+            dest_dir += DIR_SEP;
+            #endif
+            msg_Dbg( p_intf, "Downloading to folder: %s", qtu( dest_dir ) );
+            toggleVisible();
+            update_Download( p_update, qtu( dest_dir ) );
+        }
     }
 }
 
+/* Handle the events */
+void UpdateDialog::customEvent( QEvent *event )
+{
+    if( event->type() == UDOkEvent )
+        updateNotify( true );
+    else
+        updateNotify( false );
+}
+
+/* Notify the end of the update_Check */
+void UpdateDialog::updateNotify( bool b_result )
+{
+    /* The update finish without errors */
+    if( b_result )
+    {
+        if( update_NeedUpgrade( p_update ) )
+        {
+            update_release_t *p_release = update_GetRelease( p_update );
+            assert( p_release );
+            b_checked = true;
+            updateButton->setText( "Yes" );
+            QString message = qtr( "A new version of VLC(" )
+                              + QString::number( p_release->i_major ) + "."
+                              + QString::number( p_release->i_minor ) + "."
+                              + QString::number( p_release->i_revision );
+            if( p_release->extra )
+                message += p_release->extra;
+            message += qtr( ") is available.");
+            updateLabelTop->setText( message );
+
+            updateText->setText( qfu( p_release->psz_desc ) );
+            updateText->setEnabled( true );
+
+            updateLabelDown->show();
+
+            /* Force the dialog to be shown */
+            this->show();
+        }
+        else
+            updateLabelTop->setText(
+                    qtr( "You have the latest version of VLC media player." ) );
+    }
+    else
+        updateLabelTop->setText(
+                    qtr( "An error occurred while checking for updates..." ) );
+
+    updateButton->setEnabled( true );
+}
+
 #endif
+