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 d1c16fe659d4437bcd5ec2770df22073202134ac..d5999476fc475eea6bdf9ddcbdac66cef645f431 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -207,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 );
@@ -255,15 +255,15 @@ 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 diretories names.
-                    Windows doesn't add an ending separtor so we might add it. */
+            /*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
@@ -271,8 +271,6 @@ void UpdateDialog::UpdateOrDownload()
             toggleVisible();
             update_Download( p_update, qtu( dest_dir ) );
         }
-        else
-            updateButton->setEnabled( true );
     }
 }
 
@@ -296,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 )  );