X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=16b2e21fc632d6083ae5962a0dbc952d2e646739;hb=32c874662a6ba2f05edd7d5a0206a7719ddf1a03;hp=86e674a9583d8dbb00a6b43e4c146640626bf1ca;hpb=5122c9d9e9f5851a84c2b037cc35dbacd3699aef;p=vlc

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 86e674a958..16b2e21fc6 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "dialogs/help.hpp"
 #include <vlc_about.h>
@@ -99,7 +99,7 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
     closeButton->setDefault( true );
 
     QLabel *introduction = new QLabel(
-            qtr( "VLC media player " VERSION_MESSAGE ) );
+            qtr( "VLC media player" " " VERSION_MESSAGE ) );
     QLabel *iconVLC = new QLabel;
     if( QDate::currentDate().dayOfYear() >= 354 )
         iconVLC->setPixmap( QPixmap( ":/vlc48-christmas.png" ) );
@@ -117,14 +117,15 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
             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"
-                "Also, VLC works on essentially every popular platform.\n\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 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" )
+            + qtr( "Copyright (C) " COPYRIGHT_YEARS " by the VideoLAN Team.\n" )
             + "vlc@videolan.org, http://www.videolan.org" );
     infoLabel->setWordWrap( infoLabel );
 
@@ -146,9 +147,9 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_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 );
@@ -185,7 +186,7 @@ void AboutDialog::close()
  * UpdateDialog
  *****************************************************************************/
 /* callback to get information from the core */
-static void UpdateCallback( void *data, vlc_bool_t b_ret )
+static void UpdateCallback( void *data, bool b_ret )
 {
     UpdateDialog* UDialog = (UpdateDialog *)data;
     QEvent* event;
@@ -202,21 +203,22 @@ UpdateDialog *UpdateDialog::instance = NULL;
 
 UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 {
-    setWindowTitle( qtr( "Update" ) );
+    setWindowTitle( qtr( "VLC media player updates" ) );
 
     QGridLayout *layout = new QGridLayout( this );
 
-    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
-    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 );
 
-    updateLabel = new QLabel( qtr( "Checking for the update..." ) );
+    updateLabel = new QLabel( qtr( "Checking for an update..." ) );
     updateLabel->setWordWrap( true );
 
-    layout->addWidget( updateLabel, 0, 0 );
+    layout->addWidget( updateLabel, 0, 0, Qt::AlignTop );
     layout->addWidget( buttonBox, 1, 0 );
 
     BUTTONACT( updateButton, UpdateOrDownload() );
@@ -226,7 +228,8 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
     p_update = update_New( p_intf );
     b_checked = false;
 
-    readSettings( "Update", QSize( 120, 80 ) );
+    setMinimumSize( 200, 100 );
+    readSettings( "Update", QSize( 200, 100 ) );
 
     /* Check for updates */
     UpdateOrDownload();
@@ -249,23 +252,27 @@ void UpdateDialog::UpdateOrDownload()
     if( !b_checked )
     {
         updateButton->setEnabled( false );
-        msg_Dbg( p_intf, "Launching an update Request" );
+        updateLabel->setText( qtr( "Launching an update request..." ) );
         update_Check( p_update, UpdateCallback, this );
     }
     else
     {
-        updateButton->setEnabled( false );
         QString dest_dir = QFileDialog::getExistingDirectory( this,
-                                 qtr( "Select a directory ..." ),
-                                 qfu( p_update->p_libvlc->psz_homedir ) );
+                                 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 ) );
         }
-        else
-            updateButton->setEnabled( true );
     }
 }
 
@@ -284,19 +291,33 @@ void UpdateDialog::updateNotify( bool b_result )
     /* The update finish without errors */
     if( b_result )
     {
-        if( update_CompareReleaseToCurrent( p_update ) == UpdateReleaseStatusNewer )
+        if( update_NeedUpgrade( p_update ) )
         {
+            update_release_t *p_release = update_GetRelease( p_update );
+            assert( p_release );
             b_checked = true;
-            updateButton->setText( "Download" );
-            updateLabel->setText( qtr( "There is a new version of vlc :\n" )
-                                + qfu( p_update->release.psz_desc )  );
+            updateButton->setText( "Ok" );
+            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.\nDo you want to download it?\n" )
+                    + qfu( p_release->psz_desc );
+
+            updateLabel->setText( message );
+
+            /* Force the dialog to be shown */
+            this->show();
         }
         else
-            updateLabel->setText( qtr( "You have the latest version of vlc" ) );
+            updateLabel->setText(
+                    qtr( "You have the latest version of VLC media player." ) );
     }
     else
         updateLabel->setText(
-                        qtr( "An error occurred while checking for updates" ) );
+                    qtr( "An error occurred while checking for updates..." ) );
 
     adjustSize();
     updateButton->setEnabled( true );