X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs%2Fhelp.cpp;h=20190d1dc13f7c27f952f056823b3eb94c69659e;hb=47e69cf6132dfd1daa1ef8fb17fa6b2af5c16e18;hp=7b6b0fdbdbc8f2b6f4fff2276a894481390316e5;hpb=8e756cec1bd06ae701367708134fdbbb76bed755;p=vlc

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 7b6b0fdbdb..20190d1dc1 100644
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -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 © " 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 );
@@ -202,22 +203,36 @@ 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 an update..." ) );
-    updateLabel->setWordWrap( true );
+    updateLabelTop = new QLabel( qtr( "Checking for an update..." ) );
+    updateLabelTop->setWordWrap( true );
+    updateLabelTop->setMargin( 8 );
+
+    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( updateLabel, 0, 0 );
-    layout->addWidget( buttonBox, 1, 0 );
+    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() );
@@ -226,7 +241,10 @@ 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( 300, 100 );
+    setMaximumSize( 400, 300 );
+
+    readSettings( "Update", QSize( 300, 100 ) );
 
     /* Check for updates */
     UpdateOrDownload();
@@ -249,23 +267,27 @@ void UpdateDialog::UpdateOrDownload()
     if( !b_checked )
     {
         updateButton->setEnabled( false );
-        msg_Dbg( p_intf, "Launching an update request" );
+        updateLabelTop->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 ..." ),
+                                 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 );
     }
 }
 
@@ -289,18 +311,32 @@ void UpdateDialog::updateNotify( bool b_result )
             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_release->psz_desc )  );
+            updateButton->setText( qtr( "&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
-            updateLabel->setText( qtr( "You have the latest version of VLC" ) );
+            updateLabelTop->setText(
+                    qtr( "You have the latest version of VLC media player." ) );
     }
     else
-        updateLabel->setText(
-                        qtr( "An error occurred while checking for updates" ) );
+        updateLabelTop->setText(
+                    qtr( "An error occurred while checking for updates..." ) );
 
-    adjustSize();
     updateButton->setEnabled( true );
 }