From: Rémi Duraffort <ivoire@videolan.org>
Date: Tue, 29 Jul 2008 12:27:41 +0000 (+0200)
Subject: Partially fix #1788 : don't disable the button during the update.
X-Git-Tag: 0.9.0-test3~166
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2ddb17af38f099e96c1a0dea6673db855ef8dc9d;p=vlc

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

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 559e751b19..d5999476fc 100644
--- 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,7 +255,6 @@ void UpdateDialog::UpdateOrDownload()
     }
     else
     {
-        updateButton->setEnabled( false );
         QString dest_dir = QFileDialog::getExistingDirectory( this,
                                  qtr( "Select a directory..." ),
                                  qfu( config_GetHomeDir() ) );
@@ -272,8 +271,6 @@ void UpdateDialog::UpdateOrDownload()
             toggleVisible();
             update_Download( p_update, qtu( dest_dir ) );
         }
-        else
-            updateButton->setEnabled( true );
     }
 }
 
@@ -297,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 )  );