Partially fix #1788 : don't disable the button during the update.

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

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 4b0012f9cef1cf5920e265c00ece56daba389c60..d5999476fc475eea6bdf9ddcbdac66cef645f431 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -117,7 +117,8 @@ 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"
@@ -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 );
@@ -206,7 +207,7 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
 
     QGridLayout *layout = new QGridLayout( this );
 
-    QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
+    QPushButton *closeButton = new QPushButton( qtr( "&Cancel" ) );
     updateButton = new QPushButton( qtr( "&Update List" ) );
     updateButton->setDefault( true );
     QDialogButtonBox *buttonBox = new QDialogButtonBox( Qt::Horizontal );
@@ -254,18 +255,22 @@ void UpdateDialog::UpdateOrDownload()
     }
     else
     {
-        updateButton->setEnabled( false );
         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 ) );
         }
-        else
-            updateButton->setEnabled( true );
     }
 }
 
@@ -289,7 +294,7 @@ void UpdateDialog::updateNotify( bool b_result )
             update_release_t *p_release = update_GetRelease( p_update );
             assert( p_release );
             b_checked = true;
-            updateButton->setText( "Download" );
+            updateButton->setText( "Ok" );
             updateLabel->setText( qtr( "There is a new version of VLC :\n" )
                                 + qfu( p_release->psz_desc )  );