Add fonctionality to the update dialog - Patches by Rémi Duraffort

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index 15f7f23d58b77d83c3ecca1b766568f9391e8096..88c548ba1bf4dfef49dd912e04d732fc1c4068b1 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -38,6 +38,8 @@
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QDialogButtonBox>
+#include <QFileDialog>
+
 
 HelpDialog *HelpDialog::instance = NULL;
 
@@ -171,7 +173,7 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
     QGridLayout *layout = new QGridLayout( this );
 
     QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
-    QPushButton *updateButton = new QPushButton( qtr( "&Update List" ) );
+    updateButton = new QPushButton( qtr( "&Update List" ) );
     updateButton->setDefault( true );
     QDialogButtonBox *buttonBox = new QDialogButtonBox(Qt::Horizontal);
     buttonBox->addButton( updateButton, QDialogButtonBox::ActionRole );
@@ -197,10 +199,11 @@ UpdateDialog::UpdateDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
     layout->addWidget( checkGroup, 0, 0 );
     layout->addWidget( buttonBox, 1, 0 );
 
-    BUTTONACT( updateButton, update() );
+    BUTTONACT( updateButton, updateOrUpload() );
     BUTTONACT( closeButton, close() );
 
     p_update = update_New( _p_intf );
+    b_updated = false;
 }
 
 UpdateDialog::~UpdateDialog()
@@ -213,39 +216,102 @@ void UpdateDialog::close()
     toggleVisible();
 }
 
-void UpdateDialog::update()
+void UpdateDialog::updateOrUpload()
 {
-    update_Check( p_update, VLC_FALSE );
-    update_iterator_t *p_uit = update_iterator_New( p_update );
-    if( p_uit )
+    if( !b_updated )
     {
-        p_uit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
-        p_uit->i_t = UPDATE_FILE_TYPE_ALL;
-        update_iterator_Action( p_uit, UPDATE_MIRROR );
-        while( update_iterator_Action( p_uit, UPDATE_FILE ) != UPDATE_FAIL )
+        update_Check( p_update, VLC_FALSE );
+        update_iterator_t *p_updateit = update_iterator_New( p_update );
+        bool b_download = false;
+        if( p_updateit )
+        {
+            p_updateit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
+            p_updateit->i_t = UPDATE_FILE_TYPE_ALL;
+            update_iterator_Action( p_updateit, UPDATE_MIRROR );
+            while( update_iterator_Action( p_updateit, UPDATE_FILE ) != UPDATE_FAIL )
+            {
+                switch( p_updateit->file.i_type )
+                {
+                    case UPDATE_FILE_TYPE_INFO:
+                    checkInfo->setText( qtr( "Information" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
+                    checkInfo->setDisabled( false );
+                    checkInfo->setCheckState( Qt::Checked );
+                    b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_SOURCE:
+                    checkSource->setText( qtr( "Source" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
+                    checkSource->setDisabled( false );
+                    checkSource->setCheckState( Qt::Checked );
+                    b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_BINARY:
+                    checkBinary->setText( qtr( "Binary" ) + " (" + qfu( p_updateit->release.psz_version ) + ")" );
+                    checkBinary->setDisabled( false );
+                    checkBinary->setCheckState( Qt::Checked );
+                    b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_PLUGIN:
+                    checkPlugin->setText( qtr( "Plugin" ) + " (" + qfu( p_updateit->release.psz_version ) + ")");
+                    checkPlugin->setDisabled( false );
+                    checkPlugin->setCheckState( Qt::Checked );
+                    b_download = true;
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+        if( b_download )
         {
-            switch( p_uit->file.i_type )
+            updateButton->setText(qtr( "Download" ) );
+            b_updated = true;
+        }
+        update_iterator_Delete( p_updateit );
+    }
+    else
+    {
+        update_iterator_t *p_updateit = update_iterator_New( p_update );
+        bool b_download = false;
+        if( p_updateit )
+        {
+            QString saveDir = QFileDialog::getExistingDirectory( this, qtr( "Choose a direcctory..." ),
+                                                                qfu( p_intf->p_libvlc->psz_homedir ) );
+
+            p_updateit->i_rs = UPDATE_RELEASE_STATUS_NEWER;
+            p_updateit->i_t = UPDATE_FILE_TYPE_ALL;
+            update_iterator_Action( p_updateit, UPDATE_MIRROR );
+
+            while( update_iterator_Action( p_updateit, UPDATE_FILE ) != UPDATE_FAIL )
             {
-            case UPDATE_FILE_TYPE_INFO:
-                checkInfo->setDisabled( false );
-                checkInfo->setCheckState( Qt::Checked );
-                break;
-            case UPDATE_FILE_TYPE_SOURCE:
-                checkSource->setDisabled( false );
-                checkSource->setCheckState( Qt::Checked );
-                break;
-            case UPDATE_FILE_TYPE_BINARY:
-                checkBinary->setDisabled( false );
-                checkBinary->setCheckState( Qt::Checked );
-                break;
-            case UPDATE_FILE_TYPE_PLUGIN:
-                checkPlugin->setDisabled( false );
-                checkPlugin->setCheckState( Qt::Checked );
-                break;
-            default:
-                break;
+                b_download = false;
+                switch( p_updateit->file.i_type )
+                {
+                case UPDATE_FILE_TYPE_INFO:
+                    if( checkInfo->isChecked() )
+                        b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_SOURCE:
+                    if( checkSource->isChecked() )
+                        b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_BINARY:
+                    if( checkBinary->isChecked() )
+                        b_download = true;
+                    break;
+                case UPDATE_FILE_TYPE_PLUGIN:
+                    if( checkPlugin->isChecked() )
+                        b_download = true;
+                    break;
+                        default:
+                        break;
+                }
+                if( b_download )
+                {
+                    QString strFileName = p_updateit->file.psz_url;
+                    strFileName.remove( 0, strFileName.lastIndexOf( "/" ) + 1 );
+                    update_download( p_updateit, qtu( ( saveDir + strFileName ) ) );
+                }
             }
         }
     }
-    update_iterator_Delete( p_uit );
 }

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index 88248ed68d80b0b90bc2746d2a345cb9bd945305..e8bf68ffe02450c6f1932ffa21bdab46c040a627 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -28,6 +28,7 @@
 
 #include "util/qvlcframe.hpp"
 
+class QPushButton;
 class QCheckBox;
 
 class HelpDialog : public QVLCFrame
@@ -85,14 +86,16 @@ public:
 private:
     UpdateDialog( intf_thread_t *);
     static UpdateDialog *instance;
+    QPushButton *updateButton;
     QCheckBox *checkInfo;
     QCheckBox *checkSource;
     QCheckBox *checkBinary;
     QCheckBox *checkPlugin;
     update_t *p_update;
+    bool b_updated;
 private slots:
     void close();
-    void update();
+    void updateOrUpload();
 };