Changeset 14274 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Nov 18, 2008 1:37:42 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39449

Message:

FE/Qt4: 3328: FE/Qt4: Update network sub-level of all GUI networking stuff. Stuff ported to Qt4 Network module + cumulative fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (6 diffs)
• VirtualBox.qrc (modified) (1 diff)
• images/register_32px.png (added)
• include/HappyHttp.h (deleted)
• include/QIHttp.h (added)
• include/VBoxDownloaderWgt.h (modified) (2 diffs)
• include/VBoxNetworkFramework.h (deleted)
• include/VBoxRegistrationDlg.h (modified) (5 diffs)
• include/VBoxUpdateDlg.h (modified) (6 diffs)
• src/HappyHttp.cpp (deleted)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/VBoxDownloaderWgt.cpp (modified) (2 diffs)
• src/VBoxNetworkFramework.cpp (deleted)
• src/VBoxProblemReporter.cpp (modified) (3 diffs)
• src/VBoxRegistrationDlg.cpp (modified) (14 diffs)
• src/VBoxUpdateDlg.cpp (modified) (12 diffs)
• ui/VBoxRegistrationDlg.ui (modified) (1 diff)
• ui/VBoxUpdateDlg.ui (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -217 +217 @@
 # Headers containing definitions of classes that use the Q_OBJECT macro.
 VirtualBox4_QT_MOCHDRS = \
+        include/QIHttp.h \
         include/QIWidgetValidator.h \
         include/QIHotKeyEdit.h \
@@ -242 +243 @@
         include/VBoxProblemReporter.h \
         include/VBoxDownloaderWgt.h \
-        include/VBoxNetworkFramework.h \
         include/VBoxAboutDlg.h \
         include/VBoxCloseVMDlg.h \
@@ -282 +282 @@
 VirtualBox4_QT_MOCSRCS = \
         src/VBoxSelectorWnd.cpp \
+        src/VBoxConsoleWnd.cpp \
         src/VBoxMediaManagerDlg.cpp
 ifdef VBOX_WITH_XPCOM
@@ -318 +319 @@
         src/VBoxVMListView.cpp \
         src/VBoxFrameBuffer.cpp \
-        src/HappyHttp.cpp \
-        src/VBoxNetworkFramework.cpp \
         src/VBoxAboutDlg.cpp \
         src/VBoxCloseVMDlg.cpp \
@@ -391 +390 @@
 # The Qt modules we're using.
 # (The include directory and lib/framework for each module will be added by the Qt4 unit.)
-VirtualBox4_QT_MODULES = Core Gui
+VirtualBox4_QT_MODULES = Core Gui Network
 
 # Import QDesigner UI sources and translations from VBoxUI.pro.
@@ -412 +411 @@
 VirtualBox4_QT_TRANSLATIONS_INST = $(INST_BIN)nls/
 
-
-# Some flag hacks (should go away).
-ifneq ($(KBUILD_TARGET),win)
- VirtualBox4_src/HappyHttp.cpp_CXXFLAGS += -fexceptions
- VirtualBox4_src/VBoxDownloaderWgt.cpp_CXXFLAGS += -fexceptions
- VirtualBox4_src/VBoxNetworkFramework.cpp_CXXFLAGS += -fexceptions
-endif
-VirtualBox4_src/HappyHttp.cpp_CXXFLAGS.linux += -O2
 
 ## @todo how to detect what tool is used?

trunk/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc

@@ -109 +109 @@
     <file alias="site_disabled_32px.png">images/site_disabled_32px.png</file>
     <file alias="register_16px.png">images/register_16px.png</file>
+    <file alias="register_32px.png">images/register_32px.png</file>
     <file alias="register_disabled_16px.png">images/register_disabled_16px.png</file>
     <file alias="reset_16px.png">images/reset_16px.png</file>

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxDownloaderWgt.h

@@ -24 +24 @@
 #define __VBoxDownloaderWgt_h__
 
-#include "HappyHttp.h"
 #include "QIWithRetranslateUI.h"
 
 /* Qt includes */
+#include <QUrl>
 #include <QWidget>
-#include <QUrl>
-#include <QMutex>
 
-class QStatusBar;
-class QAction;
+class QIHttp;
+class QHttpResponseHeader;
 class QProgressBar;
 class QToolButton;
-class QThread;
-class QTimer;
-typedef happyhttp::Connection HConnect;
 
-/** class VBoxDownloaderWgt
+/**
+ * The VBoxDownloaderWgt class is QWidget class re-implementation which embeds
+ * into the Dialog's status-bar and allows background http downloading.
+ * This class is not supposed to be used itself and made for sub-classing only.
  *
- *  The VBoxDownloaderWgt class is an QWidget class for Guest Additions
- *  http backgroung downloading. This class is also used to display the
- *  Guest Additions download state through the progress dialog integrated
- *  into the VM console status bar.
+ * This class has two parts:
+ * 1. Acknowledging (getting information about target presence and size).
+ * 2. Downloading (starting and handling file downloading process).
+ * Every subclass can determine using or not those two parts and handling
+ * the result of those parts itself.
  */
-class VBoxDownloaderWgt : public QIWithRetranslateUI<QWidget>
+class VBoxDownloaderWgt : public QIWithRetranslateUI <QWidget>
 {
     Q_OBJECT;
@@ -53 +52 @@
 public:
 
-    VBoxDownloaderWgt (QStatusBar *aStatusBar, QAction *aAction,
-                       const QString &aUrl, const QString &aTarget);
+    VBoxDownloaderWgt (const QString &aSource, const QString &aTarget);
 
+    virtual void start();
 
-    bool isCheckingPresence() { return mIsChecking; }
+protected slots:
+
+    /* Acknowledging part */
+    virtual void acknowledgeStart();
+    virtual void acknowledgeProcess (const QHttpResponseHeader &aResponse);
+    virtual void acknowledgeFinished (bool aError);
+
+    /* Downloading part */
+    virtual void downloadStart();
+    virtual void downloadProcess (int aDone, int aTotal);
+    virtual void downloadFinished (bool aError);
+
+    /* Common slots */
+    virtual void cancelDownloading();
+    virtual void abortDownload (const QString &aError);
+    virtual void suicide();
 
 protected:
 
-    void retranslateUi();
+    /* In sub-class this function will show the user downloading object size
+     * and ask him about downloading confirmation. Returns user response. */
+    virtual bool confirmDownload() = 0;
 
-private slots:
+    /* In sub-class this function will show the user which error happens
+     * in context of downloading file and executing his request. */
+    virtual void warnAboutError (const QString &aError) = 0;
 
-    /* This slot is used to control the connection timeout. */
-    void processTimeout();
-
-    /* This slot is used to process cancel-button clicking signal. */
-    void processAbort();
-
-    /* This slot is used to terminate the downloader, activate the
-     * Install Guest Additions action and removing the downloader's
-     * sub-widgets from the VM Console status-bar. */
-    void suicide();
-
-private:
-
-    /* Used to process all the widget events */
-    bool event (QEvent *aEvent);
-
-    /* This function is used to make a request to get a file */
-    void getFile();
-
-    /* This function is used to ask the user about he wants to download the
-     * founded Guest Additions image or not. It also shows the progress-bar
-     * and Cancel-button widgets. */
-    void processFile (int aSize);
-
-    /* This wrapper displays an error message box (unless @aReason is
-     * QString::null) with the cause of the download procedure
-     * termination. After the message box is dismissed, the downloader signals
-     * to close itself on the next event loop iteration. */
-    void abortDownload (const QString &aReason = QString::null);
-
-    void abortConnection();
-
-    QUrl mUrl;
+    QUrl mSource;
     QString mTarget;
-    QStatusBar *mStatusBar;
-    QAction *mAction;
+    QIHttp *mHttp;
     QProgressBar *mProgressBar;
     QToolButton *mCancelButton;
-    bool mIsChecking;
-    bool mSuicide;
-    HConnect *mConn;
-    QThread *mRequestThread;
-    QMutex mMutex;
-    QByteArray mDataArray;
-    QDataStream mDataStream;
-    QTimer *mTimeout;
 };
 
-#endif
+#endif // __VBoxDownloaderWgt_h__
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxRegistrationDlg.h

@@ -25 +25 @@
 
 #include "QIAbstractWizard.h"
-#include "VBoxRegistrationDlg.gen.h"
-#include "COMDefs.h"
 #include "QIWidgetValidator.h"
 #include "QIWithRetranslateUI.h"
+#include "VBoxRegistrationDlg.gen.h"
 
 /* Qt includes */
 #include <QUrl>
 
-class VBoxNetworkFramework;
+class QIHttp;
 
-class VBoxRegistrationDlg : public QIWithRetranslateUI2<QIAbstractWizard>,
+class VBoxRegistrationDlg : public QIWithRetranslateUI <QIAbstractWizard>,
                             public Ui::VBoxRegistrationDlg
 {
@@ -42 +41 @@
 public:
 
-    VBoxRegistrationDlg (VBoxRegistrationDlg **aSelf, QWidget *aParent = 0,
-                         Qt::WindowFlags aFlags = 0);
+    static bool hasToBeShown();
+
+    VBoxRegistrationDlg (VBoxRegistrationDlg **aSelf, QWidget *aParent = 0);
    ~VBoxRegistrationDlg();
-
-    static bool hasToBeShown();
 
 protected:
@@ -56 +54 @@
     void accept();
     void reject();
-    void handshake();
-    void registration();
-    void processTimeout();
-    void onNetBegin (int aStatus);
-    void onNetData (const QByteArray &aData);
-    void onNetEnd (const QByteArray &aData);
-    void onNetError (const QString &aError);
+
+    void handshakeStart();
+    void handshakeResponse (bool aError);
+
+    void registrationStart();
+    void registrationResponse (bool aError);
 
     void revalidate (QIWidgetValidator *aWval);
@@ -70 +67 @@
 private:
 
-    void postRequest (const QString &aHost, const QString &aUrl, const QString &aBody);
-    void abortRegisterRequest (const QString &aReason);
+    void postRequest (const QUrl &aUrl);
+    void abortRequest (const QString &aReason);
     void finish();
 
@@ -77 +74 @@
     QIWidgetValidator    *mWvalReg;
     QUrl                  mUrl;
+    QIHttp               *mHttp;
     QString               mKey;
-    QTimer               *mTimeout;
-    bool                  mHandshake;
-    bool                  mSuicide;
-    VBoxNetworkFramework *mNetfw;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxUpdateDlg.h

@@ -24 +24 @@
 #define __VBoxUpdateDlg_h__
 
-/* Common includes */
 #include "QIAbstractWizard.h"
+#include "QIWithRetranslateUI.h"
 #include "VBoxUpdateDlg.gen.h"
-#include "QIWithRetranslateUI.h"
 
 /* Qt includes */
@@ -33 +32 @@
 #include <QDate>
 
-class VBoxNetworkFramework;
+class QIHttp;
 
 /**
@@ -84 +83 @@
 
     /* Private variables */
-    static QList<UpdateDay> mDayList;
+    static QList <UpdateDay> mDayList;
 
     QString mData;
@@ -91 +90 @@
 };
 
-class VBoxUpdateDlg : public QIWithRetranslateUI2<QIAbstractWizard>,
+class VBoxUpdateDlg : public QIWithRetranslateUI <QIAbstractWizard>,
                       public Ui::VBoxUpdateDlg
 {
@@ -100 +99 @@
     static bool isNecessary();
 
-    VBoxUpdateDlg (VBoxUpdateDlg **aSelf, bool aForceRun,
-                   QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
+    VBoxUpdateDlg (VBoxUpdateDlg **aSelf, bool aForceRun, QWidget *aParent = 0);
    ~VBoxUpdateDlg();
 
 public slots:
 
-    void accept();
     void search();
 
@@ -115 +112 @@
 private slots:
 
-    void processTimeout();
-
-    void onNetBegin (int aStatus);
-    void onNetData (const QByteArray &aData);
-    void onNetEnd (const QByteArray &aData);
-    void onNetError (const QString &aError);
-
+    void accept();
+    void searchResponse (bool aError);
     void onPageShow();
 
 private:
 
-    /* Private functions */
-    void networkAbort (const QString &aReason);
-    void processResponse (const QString &aResponse);
+    void abortRequest (const QString &aReason);
 
     /* Private variables */
     VBoxUpdateDlg **mSelf;
-    VBoxNetworkFramework *mNetfw;
-    QTimer *mTimeout;
-    QUrl mUrl;
-    bool mForceRun;
-    bool mSuicide;
+    QUrl            mUrl;
+    QIHttp         *mHttp;
+    bool            mForceRun;
 };
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -36 +36 @@
 #include "QIStatusBar.h"
 #include "QIHotKeyEdit.h"
+#include "QIHttp.h"
 
 /* Qt includes */
@@ -44 +45 @@
 #include <QDir>
 #include <QTimer>
+#include <QProgressBar>
 #ifdef Q_WS_X11
 # include <QX11Info>
@@ -93 +95 @@
 class Q3HttpResponseHeader;
 #endif
+
+class VBoxAdditionsDownloader : public VBoxDownloaderWgt
+{
+    Q_OBJECT;
+
+public:
+
+    VBoxAdditionsDownloader (const QString &aSource, const QString &aTarget, QAction *aAction)
+        : VBoxDownloaderWgt (aSource, aTarget)
+        , mAction (aAction)
+    {
+        mAction->setEnabled (false);
+        retranslateUi();
+    }
+
+    void start()
+    {
+        acknowledgeStart();
+    }
+
+protected:
+
+    void retranslateUi()
+    {
+        mCancelButton->setText (tr ("Cancel"));
+        mProgressBar->setToolTip (tr ("Downloading the VirtualBox Guest Additions "
+                                      "CD image from <nobr><b>%1</b>...</nobr>")
+                                      .arg (mSource.toString()));
+        mCancelButton->setToolTip (tr ("Cancel the VirtualBox Guest "
+                                       "Additions CD image download"));
+    }
+
+private slots:
+
+    void downloadFinished (bool aError)
+    {
+        if (aError)
+            VBoxDownloaderWgt::downloadFinished (aError);
+        else
+        {
+            QByteArray receivedData (mHttp->readAll());
+            /* Serialize the incoming buffer into the .iso image. */
+            while (true)
+            {
+                QFile file (mTarget);
+                if (file.open (QIODevice::WriteOnly))
+                {
+                    file.write (receivedData);
+                    file.close();
+                    if (vboxProblem().confirmMountAdditions (mSource.toString(),
+                        QDir::toNativeSeparators (mTarget)))
+                        vboxGlobal().consoleWnd().installGuestAdditionsFrom (mTarget);
+                    QTimer::singleShot (0, this, SLOT (suicide()));
+                    break;
+                }
+                else
+                {
+                    vboxProblem().message (window(), VBoxProblemReporter::Error,
+                        tr ("<p>Failed to save the downloaded file as "
+                            "<nobr><b>%1</b>.</nobr></p>")
+                        .arg (QDir::toNativeSeparators (mTarget)));
+                }
+
+                QString target = vboxGlobal().getExistingDirectory (
+                    QFileInfo (mTarget).absolutePath(), this,
+                    tr ("Select folder to save Guest Additions image to"), true);
+                if (target.isNull())
+                    QTimer::singleShot (0, this, SLOT (suicide()));
+                else
+                    mTarget = QDir (target).absoluteFilePath (QFileInfo (mTarget).fileName());
+            }
+        }
+    }
+
+    void suicide()
+    {
+        QStatusBar *sb = qobject_cast <QStatusBar*> (parent());
+        Assert (sb);
+        sb->removeWidget (this);
+        mAction->setEnabled (true);
+        VBoxDownloaderWgt::suicide();
+    }
+
+private:
+
+    bool confirmDownload()
+    {
+        return vboxProblem().confirmDownloadAdditions (mSource.toString(),
+            mHttp->lastResponse().contentLength());
+    }
+
+    void warnAboutError (const QString &aError)
+    {
+        return vboxProblem().cannotDownloadGuestAdditions (mSource.toString(), aError);
+    }
+
+    QAction *mAction;
+};
 
 /** \class VBoxConsoleWnd
@@ -2682 +2782 @@
 #else
     char szAppPrivPath [RTPATH_MAX];
-    int rc;
-
-    rc = RTPathAppPrivateNoArch (szAppPrivPath, sizeof (szAppPrivPath));
+    int rc = RTPathAppPrivateNoArch (szAppPrivPath, sizeof (szAppPrivPath));
     AssertRC (rc);
 
@@ -2691 +2789 @@
 #endif
 
+    /* Check the standard image locations */
     if (QFile::exists (src1))
-        installGuestAdditionsFrom (src1);
+        return installGuestAdditionsFrom (src1);
     else if (QFile::exists (src2))
-        installGuestAdditionsFrom (src2);
-    else
-    {
-        /* Check for the already registered required image */
-        CVirtualBox vbox = vboxGlobal().virtualBox();
-        QString name = QString ("VBoxGuestAdditions_%1.iso")
-                                 .arg (vbox.GetVersion().remove ("_OSE"));
-
-        CDVDImage2Vector vec = vbox.GetDVDImages();
-        for (CDVDImage2Vector::ConstIterator it = vec.begin();
-             it != vec.end(); ++ it)
-        {
-            QString path = it->GetLocation();
-            /* Compare the name part ignoring the file case */
-            QString fn = QFileInfo (path).fileName();
-            if (RTPathCompare (name.toUtf8().constData(), fn.toUtf8().constData()) == 0)
-                return installGuestAdditionsFrom (path);
-        }
-
-        /* Download the required image: */
-        int rc = vboxProblem().cannotFindGuestAdditions (
-            QDir::toNativeSeparators (src1), QDir::toNativeSeparators (src2));
-        if (rc == QIMessageBox::Yes)
-        {
-            QString url = QString ("http://download.virtualbox.org/virtualbox/%1/")
-                                   .arg (vbox.GetVersion().remove ("_OSE")) + name;
-            QString target = QDir (vboxGlobal().virtualBox().GetHomeFolder())
-                                   .absoluteFilePath (name);
-
-            new VBoxDownloaderWgt (statusBar(), devicesInstallGuestToolsAction,
-                                   url, target);
-        }
+        return installGuestAdditionsFrom (src2);
+
+    /* Check for the already registered image */
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    QString name = QString ("VBoxGuestAdditions_%1.iso")
+                            .arg (vbox.GetVersion().remove ("_OSE"));
+
+    CDVDImage2Vector vec = vbox.GetDVDImages();
+    for (CDVDImage2Vector::ConstIterator it = vec.begin();
+         it != vec.end(); ++ it)
+    {
+        QString path = it->GetLocation();
+        /* Compare the name part ignoring the file case */
+        QString fn = QFileInfo (path).fileName();
+        if (RTPathCompare (name.toUtf8().constData(), fn.toUtf8().constData()) == 0)
+            return installGuestAdditionsFrom (path);
+    }
+
+    /* Download the required image */
+    int result = vboxProblem().cannotFindGuestAdditions (
+        QDir::toNativeSeparators (src1), QDir::toNativeSeparators (src2));
+    if (result == QIMessageBox::Yes)
+    {
+        QString source = QString ("http://download.virtualbox.org/virtualbox/%1/")
+                                  .arg (vbox.GetVersion().remove ("_OSE")) + name;
+        QString target = QDir (vboxGlobal().virtualBox().GetHomeFolder())
+                               .absoluteFilePath (name);
+
+        VBoxAdditionsDownloader *dl =
+            new VBoxAdditionsDownloader (source, target, devicesInstallGuestToolsAction);
+        statusBar()->addWidget (dl, 0);
+        dl->start();
     }
 }
@@ -2745 +2844 @@
 
     if (!vbox.isOk())
-    {
-        vboxProblem().cannotOpenMedium (this, vbox,
-                                        VBoxDefs::MediaType_DVD, aSource);
-        return;
-    }
+        return vboxProblem().cannotOpenMedium (this, vbox,
+                                               VBoxDefs::MediaType_DVD, aSource);
 
     Assert (!uuid.isNull());
     CDVDDrive drv = csession.GetMachine().GetDVDDrive();
     drv.MountImage (uuid);
-    /// @todo NEWMEDIA use VBoxProblemReporter::cannotMountMedia
     AssertWrapperOk (drv);
+    if (drv.isOk())
+    {
+        if (mIsAutoSaveMedia)
+        {
+            CMachine m = csession.GetMachine();
+            m.SaveSettings();
+            if (!m.isOk())
+                vboxProblem().cannotSaveMachineSettings (m);
+        }
+    }
 }
 
@@ -3635 +3740 @@
     QDialog::showEvent (aEvent);
 }
+
+#include "VBoxConsoleWnd.moc"

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp

@@ -21 +21 @@
  */
 
+#include "QIHttp.h"
+#include "VBoxDownloaderWgt.h"
 #include "VBoxGlobal.h"
-#include "VBoxProblemReporter.h"
-#include "VBoxConsoleWnd.h"
-#include "VBoxDownloaderWgt.h"
 
 /* Qt includes */
+#include <QFile>
+#include <QHBoxLayout>
+#include <QHttpResponseHeader>
 #include <QProgressBar>
-#include <QHBoxLayout>
-#include <QTimer>
 #include <QToolButton>
-#include <QStatusBar>
-#include <QDir>
-#include <QThread>
 
-/* These notifications are used to notify the GUI thread about different
- * downloading events: Downloading Started, Downloading in Progress,
- * Downloading Finished. */
-enum
+VBoxDownloaderWgt::VBoxDownloaderWgt (const QString &aSource, const QString &aTarget)
+    : mSource (aSource), mTarget (aTarget), mHttp (0)
+    , mProgressBar (new QProgressBar (this))
+    , mCancelButton (new QToolButton (this))
 {
-    StartDownloadEventType = QEvent::User + 100,
-    ProcessDownloadEventType,
-    FinishDownloadEventType,
-    ErrorDownloadEventType
-};
-
-class StartDownloadEvent : public QEvent
-{
-public:
-    StartDownloadEvent (int aStatus, long aSize)
-        : QEvent ((QEvent::Type) StartDownloadEventType)
-        , mStatus (aStatus), mSize (aSize) {}
-
-    int  mStatus;
-    long mSize;
-};
-
-class ProcessDownloadEvent : public QEvent
-{
-public:
-    ProcessDownloadEvent (const char *aData, ulong aSize)
-        : QEvent ((QEvent::Type) ProcessDownloadEventType)
-        , mData (aData, aSize) {}
-
-    QByteArray mData;
-};
-
-class FinishDownloadEvent : public QEvent
-{
-public:
-    FinishDownloadEvent()
-        : QEvent ((QEvent::Type) FinishDownloadEventType) {}
-};
-
-class ErrorDownloadEvent : public QEvent
-{
-public:
-    ErrorDownloadEvent (const QString &aInfo)
-        : QEvent ((QEvent::Type) ErrorDownloadEventType)
-        , mInfo (aInfo) {}
-
-    QString mInfo;
-};
-
-/* This callback is used to handle the file-downloading procedure
- * beginning. It checks the downloading status for the file
- * presence verifying purposes. */
-void OnBegin (const happyhttp::Response *aResponse, void *aUserdata)
-{
-    VBoxDownloaderWgt *loader = static_cast<VBoxDownloaderWgt*> (aUserdata);
-    if (loader->isCheckingPresence())
-    {
-        int status = aResponse->getstatus();
-        QString contentLength = aResponse->getheader ("Content-length");
-
-        QApplication::postEvent (loader,
-            new StartDownloadEvent (status, contentLength.toLong()));
-    }
-}
-
-/* This callback is used to handle the progress of the file-downloading
- * procedure. It also checks the downloading status for the file
- * presence verifying purposes. */
-void OnData (const happyhttp::Response*, void *aUserdata,
-             const unsigned char *aData, int aSize)
-{
-    VBoxDownloaderWgt *loader = static_cast<VBoxDownloaderWgt*> (aUserdata);
-    if (!loader->isCheckingPresence())
-    {
-        QApplication::postEvent (loader,
-            new ProcessDownloadEvent ((const char*)aData, aSize));
-    }
-}
-
-/* This callback is used to handle the finish signal of every operation's
- * response. It is used to display the errors occurred during the download
- * operation and for the received-buffer serialization procedure. */
-void OnComplete (const happyhttp::Response*, void *aUserdata)
-{
-    VBoxDownloaderWgt *loader = static_cast<VBoxDownloaderWgt*> (aUserdata);
-    if (!loader->isCheckingPresence())
-        QApplication::postEvent (loader,
-            new FinishDownloadEvent());
-}
-
-VBoxDownloaderWgt::VBoxDownloaderWgt (QStatusBar *aStatusBar, QAction *aAction,
-                                      const QString &aUrl, const QString &aTarget)
-    : QIWithRetranslateUI<QWidget> ()
-    , mUrl (aUrl), mTarget (aTarget)
-    , mStatusBar (aStatusBar), mAction (aAction)
-    , mProgressBar (0), mCancelButton (0)
-    , mIsChecking (true), mSuicide (false)
-    , mConn (new HConnect (mUrl.host().toAscii().constData(), 80))
-    , mRequestThread (0)
-    , mDataStream (&mDataArray, QIODevice::WriteOnly)
-    , mTimeout (new QTimer (this))
-{
-    /* Disable the associated action */
-    mAction->setEnabled (false);
-    mTimeout->setSingleShot (true);
-    connect (mTimeout, SIGNAL (timeout()),
-             this, SLOT (processTimeout()));
-
-    /* Drawing itself */
-    setFixedHeight (16);
-
-    mProgressBar = new QProgressBar (this);
+    /* Progress Bar setup */
     mProgressBar->setFixedWidth (100);
     mProgressBar->setFormat ("%p%");
     mProgressBar->setValue (0);
 
-    mCancelButton = new QToolButton (this);
+    /* Cancel Button setup */
     mCancelButton->setAutoRaise (true);
     mCancelButton->setFocusPolicy (Qt::TabFocus);
-    connect (mCancelButton, SIGNAL (clicked()),
-             this, SLOT (processAbort()));
+    connect (mCancelButton, SIGNAL (clicked()), this, SLOT (cancelDownloading()));
 
+    /* Downloader setup */
+    setFixedHeight (16);
     QHBoxLayout *mainLayout = new QHBoxLayout (this);
     mainLayout->setSpacing (0);
@@ -163 +55 @@
     mainLayout->addWidget (mCancelButton);
     mainLayout->addStretch (1);
-
-    /* Prepare the connection */
-    mConn->setcallbacks (OnBegin, OnData, OnComplete, this);
-
-    retranslateUi();
-    mStatusBar->addWidget (this, 1);
-
-    /* Try to get the required file for the information */
-    getFile();
 }
 
-void VBoxDownloaderWgt::retranslateUi()
+void VBoxDownloaderWgt::start()
 {
-    mCancelButton->setText (tr ("Cancel"));
-    /// @todo the below title should be parametrized
-    mProgressBar->setToolTip (tr ("Downloading the VirtualBox Guest Additions "
-                                  "CD image from <nobr><b>%1</b>...</nobr>")
-                              .arg (mUrl.toString()));
-    /// @todo the below title should be parametrized
-    mCancelButton->setToolTip (tr ("Cancel the VirtualBox Guest "
-                                   "Additions CD image download"));
+    /* By default we are not using acknowledging step, so
+     * making downloading immediately */
+    downloadStart();
 }
 
-/* This slot is used to control the connection timeout. */
-void VBoxDownloaderWgt::processTimeout()
+/* This function is used to start acknowledging mechanism:
+ * checking file presence & size */
+void VBoxDownloaderWgt::acknowledgeStart()
 {
-    abortDownload (tr ("Connection timed out."));
+    delete mHttp;
+    mHttp = new QIHttp (this, mSource.host());
+    connect (mHttp, SIGNAL (responseHeaderReceived (const QHttpResponseHeader &)),
+             this, SLOT (acknowledgeProcess (const QHttpResponseHeader &)));
+    connect (mHttp, SIGNAL (allIsDone (bool)), this, SLOT (acknowledgeFinished (bool)));
+    mHttp->get (mSource.toEncoded());
 }
 
-/* This slot is used to process cancel-button clicking signal. */
-void VBoxDownloaderWgt::processAbort()
+/* This function is used to store content length */
+void VBoxDownloaderWgt::acknowledgeProcess (const QHttpResponseHeader &aResponse)
 {
-    abortDownload (tr ("The download process has been cancelled "
-                       "by the user."));
+    /* Abort connection as we already got all we need */
+    mHttp->abort();
 }
 
-/* This slot is used to terminate the downloader, activate the
- * associated action and removing the downloader's
- * sub-widgets from the VM Console status-bar. */
+/* This function is used to ask the user about if he really want
+ * to download file of proposed size if no error present or
+ * abort download progress if error is present */
+void VBoxDownloaderWgt::acknowledgeFinished (bool aError)
+{
+    AssertMsg (aError, ("Error must be 'true' due to aborting.\n"));
+
+    mHttp->disconnect (this);
+
+    switch (mHttp->errorCode())
+    {
+        case QIHttp::Aborted:
+        {
+            /* Ask the user if he wish to download it */
+            if (confirmDownload())
+                QTimer::singleShot (0, this, SLOT (downloadStart()));
+            else
+                QTimer::singleShot (0, this, SLOT (suicide()));
+            break;
+        }
+        case QIHttp::MovedTemporarilyError:
+        {
+            /* Restart downloading at new location */
+            mSource = mHttp->lastResponse().value ("location");
+            QTimer::singleShot (0, this, SLOT (acknowledgeStart()));
+            break;
+        }
+        default:
+        {
+            /* Show error happens during acknowledging */
+            abortDownload (mHttp->errorString());
+            break;
+        }
+    }
+}
+
+/* This function is used to start downloading mechanism:
+ * downloading and saving the target */
+void VBoxDownloaderWgt::downloadStart()
+{
+    delete mHttp;
+    mHttp = new QIHttp (this, mSource.host());
+    connect (mHttp, SIGNAL (dataReadProgress (int, int)),
+             this, SLOT (downloadProcess (int, int)));
+    connect (mHttp, SIGNAL (allIsDone (bool)), this, SLOT (downloadFinished (bool)));
+    mHttp->get (mSource.toEncoded());
+}
+
+/* this function is used to observe the downloading progress through
+ * changing the corresponding qprogressbar value */
+void VBoxDownloaderWgt::downloadProcess (int aDone, int aTotal)
+{
+    mProgressBar->setMaximum (aTotal);
+    mProgressBar->setValue (aDone);
+}
+
+/* This function is used to handle the 'downloading finished' issue
+ * through saving the downloaded into the file if there in no error or
+ * notifying the user about error happens */
+void VBoxDownloaderWgt::downloadFinished (bool aError)
+{
+    mHttp->disconnect (this);
+
+    if (aError)
+    {
+        /* Show information about error happens */
+        if (mHttp->errorCode() == QIHttp::Aborted)
+            abortDownload (tr ("The download process has been cancelled by the user."));
+        else
+            abortDownload (mHttp->errorString());
+    }
+    else
+    {
+        /* Trying to serialize the incoming buffer into the target, this is the
+         * default behavior which have to be reimplemented in sub-class */
+        QFile file (mTarget);
+        if (file.open (QIODevice::WriteOnly))
+        {
+            file.write (mHttp->readAll());
+            file.close();
+        }
+        QTimer::singleShot (0, this, SLOT (suicide()));
+    }
+}
+
+/* This slot is used to process cancel-button clicking */
+void VBoxDownloaderWgt::cancelDownloading()
+{
+    QTimer::singleShot (0, this, SLOT (suicide()));
+}
+
+/* This function is used to abort download by showing aborting reason
+ * and calling the downloader's delete function */
+void VBoxDownloaderWgt::abortDownload (const QString &aError)
+{
+    warnAboutError (aError);
+    QTimer::singleShot (0, this, SLOT (suicide()));
+}
+
+/* This function is used to delete the downloader widget itself,
+ * should be reimplemented to enhanse necessary functionality in sub-class */
 void VBoxDownloaderWgt::suicide()
 {
-    delete mRequestThread;
-    delete mConn;
-
-    mAction->setEnabled (true);
-    mStatusBar->removeWidget (this);
     delete this;
 }
 
-/* Used to process all the widget events */
-bool VBoxDownloaderWgt::event (QEvent *aEvent)
-{
-    switch (aEvent->type())
-    {
-        case StartDownloadEventType:
-        {
-            StartDownloadEvent *e = static_cast<StartDownloadEvent*> (aEvent);
-
-            mTimeout->stop();
-            if (e->mStatus == 404)
-                abortDownload (tr ("Could not locate the file on "
-                    "the server (response: %1).").arg (e->mStatus));
-            else
-                processFile (e->mSize);
-
-            return true;
-        }
-        case ProcessDownloadEventType:
-        {
-            ProcessDownloadEvent *e = static_cast<ProcessDownloadEvent*> (aEvent);
-
-            mTimeout->start (20000);
-            mProgressBar->setValue (mProgressBar->value() + e->mData.size());
-            mDataStream.writeRawData (e->mData.data(), e->mData.size());
-
-            return true;
-        }
-        case FinishDownloadEventType:
-        {
-            mTimeout->stop();
-
-            /* Serialize the incoming buffer into the .iso image. */
-            while (true)
-            {
-                QFile file (mTarget);
-                if (file.open (QIODevice::WriteOnly))
-                {
-                    file.write (mDataArray);
-                    file.close();
-                    /// @todo the below action is not part of the generic
-                    //  VBoxDownloaderWgt functionality, so this class should just
-                    //  emit a signal when it is done saving the downloaded file
-                    //  (succeeded or failed).
-                    if (vboxProblem()
-                            .confirmMountAdditions (mUrl.toString(),
-                                                    QDir::toNativeSeparators (mTarget)))
-                        vboxGlobal().consoleWnd().installGuestAdditionsFrom (mTarget);
-                    QTimer::singleShot (0, this, SLOT (suicide()));
-                    break;
-                }
-                else
-                {
-                    vboxProblem().message (mStatusBar->window(),
-                        VBoxProblemReporter::Error,
-                        tr ("<p>Failed to save the downloaded file as "
-                            "<nobr><b>%1</b>.</nobr></p>")
-                        .arg (QDir::toNativeSeparators (mTarget)));
-                }
-
-                /// @todo read the todo above (probably should just parametrize
-                /// the title)
-                QString target = vboxGlobal().getExistingDirectory (
-                    QFileInfo (mTarget).absolutePath(), this,
-                    tr ("Select folder to save Guest Additions image to"), true);
-                if (target.isNull())
-                    QTimer::singleShot (0, this, SLOT (suicide()));
-                else
-                    mTarget = QDir (target).absoluteFilePath (QFileInfo (mTarget).fileName());
-            }
-
-            return true;
-        }
-        case ErrorDownloadEventType:
-        {
-            ErrorDownloadEvent *e = static_cast<ErrorDownloadEvent*> (aEvent);
-
-            abortDownload (e->mInfo);
-
-            return true;
-        }
-        default:
-            break;
-    }
-
-    return QWidget::event (aEvent);
-}
-
-/* This function is used to make a request to get a file */
-void VBoxDownloaderWgt::getFile()
-{
-    /* Http request thread class */
-    class Thread : public QThread
-    {
-    public:
-
-        Thread (VBoxDownloaderWgt *aParent, HConnect *aConn,
-                const QString &aPath, QMutex *aMutex)
-            : mParent (aParent), mConn (aConn)
-            , mPath (aPath), mMutex (aMutex) {}
-
-        virtual void run()
-        {
-            try
-            {
-                mConn->request ("GET", mPath.toAscii().constData());
-                while (mConn->outstanding())
-                {
-                    QMutexLocker locker (mMutex);
-                    mConn->pump();
-                }
-            }
-            catch (happyhttp::Wobbly &ex)
-            {
-                QApplication::postEvent (mParent,
-                    new ErrorDownloadEvent (ex.what()));
-            }
-        }
-
-    private:
-
-        VBoxDownloaderWgt *mParent;
-        HConnect *mConn;
-        QString mPath;
-        QMutex *mMutex;
-    };
-
-    if (!mRequestThread)
-        mRequestThread = new Thread (this, mConn, mUrl.path(), &mMutex);
-    mRequestThread->start();
-    mTimeout->start (20000);
-}
-
-/* This function is used to ask the user about he wants to download the
- * founded Guest Additions image or not. It also shows the progress-bar
- * and Cancel-button widgets. */
-void VBoxDownloaderWgt::processFile (int aSize)
-{
-    abortConnection();
-
-    /// @todo the below action is not part of the generic
-    //  VBoxDownloaderWgt functionality, so this class should just
-    //  emit a signal when it is done detecting the file size.
-
-    /* Ask user about GA image downloading */
-    if (vboxProblem().confirmDownloadAdditions (mUrl.toString(), aSize))
-    {
-        mIsChecking = false;
-        mProgressBar->setMaximum (aSize);
-        getFile();
-    }
-    else
-        abortDownload();
-}
-
-/* This wrapper displays an error message box (unless aReason is
- * QString::null) with the cause of the download procedure
- * termination. After the message box is dismissed, the downloader signals
- * to close itself on the next event loop iteration. */
-void VBoxDownloaderWgt::abortDownload (const QString &aReason)
-{
-    abortConnection();
-
-    /* Protect against double kill request. */
-    if (mSuicide)
-        return;
-    mSuicide = true;
-
-    /// @todo the below action is not part of the generic
-    //  VBoxDownloaderWgt functionality, so this class should just emit a
-    //  signal to display the error message when the download is aborted.
-
-    if (!aReason.isNull())
-        vboxProblem().cannotDownloadGuestAdditions (mUrl.toString(), aReason);
-
-    /* Allows all the queued signals to be processed before quit. */
-    QTimer::singleShot (0, this, SLOT (suicide()));
-}
-
-void VBoxDownloaderWgt::abortConnection()
-{
-    mMutex.lock();
-    mConn->close();
-    mMutex.unlock();
-}
-

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -1539 +1539 @@
 
 bool VBoxProblemReporter::confirmDownloadAdditions (const QString &aURL,
-                                                   ulong aSize)
+                                                    ulong aSize)
 {
     return messageOkCancel (&vboxGlobal().consoleWnd(), Question,
@@ -1624 +1624 @@
     message (aParent, Error,
              tr ("<p>Failed to connect to the VirtualBox online "
-                 "registration service.</p><p>%1</p>")
+                 "registration service due to the following error:</p><p><b>%1</b></p>")
                  .arg (aReason));
 }
@@ -1656 +1656 @@
                                              const QString &aReason)
 {
-    message (aParent, Info,
+    message (aParent, Error,
              tr ("<p>Unable to obtain the new version information "
-                 "due to the following network error:</p><p><b>%1</b></p>")
+                 "due to the following error:</p><p><b>%1</b></p>")
                  .arg (aReason));
 }

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxRegistrationDlg.cpp

@@ -21 +21 @@
  */
 
-#include "VBoxRegistrationDlg.h"
+#include "QIHttp.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxNetworkFramework.h"
+#include "VBoxRegistrationDlg.h"
 
 /* Qt includes */
 #include <QTimer>
-#include <QProcess>
-
-#include <iprt/err.h>
-#include <iprt/param.h>
-#include <iprt/path.h>
-
-/* Time to auto-disconnect if no network answer received. */
-static const int MaxWaitTime = 20000;
 
 /**
@@ -47 +39 @@
         : mIsValid (false), mIsRegistered (false)
         , mData (aData)
-        , mTriesLeft (3 /* the initial tries value! */)
+        , mTriesLeft (3 /* the initial tries value */)
     {
         decode (aData);
@@ -53 +45 @@
 
     VBoxRegistrationData (const QString &aName, const QString &aEmail,
-                          const QString &aPrivate)
+                          const QString &aIsPrivate)
         : mIsValid (true), mIsRegistered (true)
-        , mName (aName), mEmail (aEmail), mPrivate (aPrivate)
+        , mName (aName), mEmail (aEmail), mIsPrivate (aIsPrivate)
         , mTriesLeft (0)
     {
-        encode (aName, aEmail, aPrivate);
+        encode (aName, aEmail, aIsPrivate);
     }
 
-    bool isValid() const              { return mIsValid; }
-    bool isRegistered() const         { return mIsRegistered; }
-
-    const QString &data() const       { return mData; }
-    const QString &name() const       { return mName; }
-    const QString &email() const      { return mEmail; }
-    const QString &isPrivate() const  { return mPrivate; }
-
-    uint triesLeft() const            { return mTriesLeft; }
+    bool isValid() const { return mIsValid; }
+    bool isRegistered() const { return mIsRegistered; }
+
+    const QString &data() const { return mData; }
+    const QString &name() const { return mName; }
+    const QString &email() const { return mEmail; }
+    const QString &isPrivate() const { return mIsPrivate; }
+
+    uint triesLeft() const { return mTriesLeft; }
 
 private:
@@ -117 +109 @@
         mName = dataList [0];
         mEmail = dataList [1];
-        mPrivate = dataList [2];
+        mIsPrivate = dataList [2];
 
         mIsValid = true;
@@ -189 +181 @@
     QString mName;
     QString mEmail;
-    QString mPrivate;
+    QString mIsPrivate;
 
     uint mTriesLeft;
 };
 
-VBoxRegistrationDlg::VBoxRegistrationDlg (VBoxRegistrationDlg **aSelf,
-                                          QWidget *aParent,
-                                          Qt::WindowFlags aFlags)
-    : QIWithRetranslateUI2<QIAbstractWizard> (aParent, aFlags)
+/* Static member to check if registration dialog necessary. */
+bool VBoxRegistrationDlg::hasToBeShown()
+{
+    VBoxRegistrationData regData (vboxGlobal().virtualBox().
+        GetExtraData (VBoxDefs::GUI_RegistrationData));
+
+    return (!regData.isValid()) ||
+           (!regData.isRegistered() && regData.triesLeft() > 0);
+}
+
+VBoxRegistrationDlg::VBoxRegistrationDlg (VBoxRegistrationDlg **aSelf, QWidget *aParent)
+    : QIWithRetranslateUI <QIAbstractWizard> (aParent)
     , mSelf (aSelf)
     , mWvalReg (0)
     , mUrl ("http://registration.virtualbox.org/register762.php")
-    , mKey (QString::null)
-    , mTimeout (new QTimer (this))
-    , mHandshake (true)
-    , mSuicide (false)
-    , mNetfw (0)
-{
-    /* Store external pointer to this dialog. */
+    , mHttp (new QIHttp (this, mUrl.host()))
+{
+    /* Store external pointer to this dialog */
     *mSelf = this;
 
     /* Apply UI decorations */
     Ui::VBoxRegistrationDlg::setupUi (this);
+
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/register_32px.png", ":/register_16px.png"));
 
     /* Initialize wizard hdr */
@@ -219 +219 @@
     QRegExp nameExp ("[\\S\\s]+");
     /* E-mail address is validated according to RFC2821, RFC2822,
-     * see http://en.wikipedia.org/wiki/E-mail_address. */
+     * see http://en.wikipedia.org/wiki/E-mail_address */
     QRegExp emailExp ("(([a-zA-Z0-9_\\-\\.!#$%\\*/?|^{}`~&'\\+=]*"
                         "[a-zA-Z0-9_\\-!#$%\\*/?|^{}`~&'\\+=])|"
@@ -234 +234 @@
     mLeEmail->setMaxLength (50);
 
-    /* This is a single shot timer */
-    mTimeout->setSingleShot (true);
-
     /* Setup other connections */
     mWvalReg = new QIWidgetValidator (mPageReg, this);
@@ -243 +240 @@
     connect (mWvalReg, SIGNAL (isValidRequested (QIWidgetValidator *)),
              this, SLOT (revalidate (QIWidgetValidator *)));
-    connect (mTimeout, SIGNAL (timeout()), this, SLOT (processTimeout()));
 
     /* Setup initial dialog parameters. */
@@ -264 +260 @@
 VBoxRegistrationDlg::~VBoxRegistrationDlg()
 {
-    /* Delete network framework. */
-    delete mNetfw;
-
     /* Erase dialog handle in config file. */
     vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
@@ -273 +266 @@
     /* Erase external pointer to this dialog. */
     *mSelf = 0;
-}
-
-/* Static member to check if registration dialog necessary. */
-bool VBoxRegistrationDlg::hasToBeShown()
-{
-    VBoxRegistrationData regData (vboxGlobal().virtualBox().
-        GetExtraData (VBoxDefs::GUI_RegistrationData));
-
-    return !regData.isValid() ||
-           (!regData.isRegistered() && regData.triesLeft() > 0);
 }
 
@@ -302 +285 @@
 
     /* Perform connection handshake */
-    QTimer::singleShot (0, this, SLOT (handshake()));
+    QTimer::singleShot (0, this, SLOT (handshakeStart()));
 }
 
@@ -325 +308 @@
 }
 
-void VBoxRegistrationDlg::handshake()
-{
-    /* Handshake arguments initializing */
-    QString version = vboxGlobal().virtualBox().GetVersion();
-    version = QUrl::toPercentEncoding (version);
+void VBoxRegistrationDlg::handshakeStart()
+{
+    /* Compose query */
+    QUrl url (mUrl);
+    url.addQueryItem ("version", vboxGlobal().virtualBox().GetVersion());
 
     /* Handshake */
-    QString body = QString ("version=%1").arg (version);
-    postRequest (mUrl.host(), mUrl.path(), body);
-}
-
-void VBoxRegistrationDlg::registration()
-{
-    /* Registration arguments initializing */
-    mHandshake = false;
-    QString version = vboxGlobal().virtualBox().GetVersion();
-    QString platform = vboxGlobal().platformInfo();
-    QString name = mLeName->text();
-    QString email = mLeEmail->text();
-    QString prvt = mCbUse->isChecked() ? "1" : "0";
-    version = QUrl::toPercentEncoding (version);
-    platform = QUrl::toPercentEncoding (platform);
-    name = QUrl::toPercentEncoding (name);
-    email = QUrl::toPercentEncoding (email);
+    mHttp->disconnect (this);
+    connect (mHttp, SIGNAL (allIsDone (bool)), this, SLOT (handshakeResponse (bool)));
+    mHttp->post (url.toEncoded());
+}
+
+void VBoxRegistrationDlg::handshakeResponse (bool aError)
+{
+    /* Block all the other incoming signals */
+    mHttp->disconnect (this);
+
+    /* Process error if present */
+    if (aError)
+        return abortRequest (mHttp->errorString());
+
+    /* Read received data */
+    mKey = mHttp->readAll();
+
+    /* Verifying key correctness */
+    if (QString (mKey).indexOf (QRegExp ("^[a-zA-Z0-9]{32}$")))
+        return abortRequest (tr ("Could not perform connection handshake."));
+
+    /* Perform registration */
+    QTimer::singleShot (0, this, SLOT (registrationStart()));
+}
+
+void VBoxRegistrationDlg::registrationStart()
+{
+    /* Compose query */
+    QUrl url (mUrl);
+    url.addQueryItem ("version", vboxGlobal().virtualBox().GetVersion());
+    url.addQueryItem ("key", mKey);
+    url.addQueryItem ("platform", vboxGlobal().platformInfo());
+    url.addQueryItem ("name", mLeName->text());
+    url.addQueryItem ("email", mLeEmail->text());
+    url.addQueryItem ("private", mCbUse->isChecked() ? "1" : "0");
 
     /* Registration */
-    QString body;
-    body += QString ("version=%1").arg (version);
-    body += QString ("&key=%1").arg (mKey);
-    body += QString ("&platform=%1").arg (platform);
-    body += QString ("&name=%1").arg (name);
-    body += QString ("&email=%1").arg (email);
-    body += QString ("&private=%1").arg (prvt);
-
-    postRequest (mUrl.host(), mUrl.path(), body);
-}
-
-void VBoxRegistrationDlg::processTimeout()
-{
-    abortRegisterRequest (tr ("Connection timed out."));
-}
-
-/* Handles the network request begining. */
-void VBoxRegistrationDlg::onNetBegin (int aStatus)
-{
-    if (mSuicide) return;
-
-    if (aStatus == 404)
-        abortRegisterRequest (tr ("Could not locate the registration form on "
-            "the server (response: %1).").arg (aStatus));
-    else
-        mTimeout->start (MaxWaitTime);
-}
-
-/* Handles the network request data incoming. */
-void VBoxRegistrationDlg::onNetData (const QByteArray&)
-{
-    if (mSuicide) return;
-
-    mTimeout->start (MaxWaitTime);
-}
-
-/* Handles the network request end. */
-void VBoxRegistrationDlg::onNetEnd (const QByteArray &aTotalData)
-{
-    if (mSuicide) return;
-
-    mTimeout->stop();
-    if (mHandshake)
-    {
-        /* Verifying key correctness */
-        if (QString (aTotalData).indexOf (QRegExp ("^[a-zA-Z0-9]{32}$")))
-        {
-            abortRegisterRequest (tr ("Could not perform connection handshake."));
-            return;
-        }
-        mKey = aTotalData;
-
-        /* Perform registration */
-        QTimer::singleShot (0, this, SLOT (registration()));
-    }
-    else
-    {
-        /* Show registration result */
-        QString result (aTotalData);
-        vboxProblem().showRegisterResult (this, result);
-
-        /* Close the dialog */
-        result == "OK" ? finish() : reject();
-    }
-}
-
-/* Handles the network error. */
-void VBoxRegistrationDlg::onNetError (const QString &aError)
-{
-    abortRegisterRequest (aError);
+    mHttp->disconnect (this);
+    connect (mHttp, SIGNAL (allIsDone (bool)), this, SLOT (registrationResponse (bool)));
+    mHttp->post (url.toEncoded());
+}
+
+void VBoxRegistrationDlg::registrationResponse (bool aError)
+{
+    /* Block all the other incoming signals */
+    mHttp->disconnect (this);
+
+    /* Process error if present */
+    if (aError)
+        return abortRequest (mHttp->errorString());
+
+    /* Read received data */
+    QString data (mHttp->readAll());
+
+    /* Show registration result */
+    vboxProblem().showRegisterResult (this, data);
+
+    /* Close the dialog */
+    data == "OK" ? finish() : reject();
 }
 
@@ -441 +394 @@
 }
 
-void VBoxRegistrationDlg::postRequest (const QString &aHost,
-                                       const QString &aUrl,
-                                       const QString &aBody)
-{
-    delete mNetfw;
-    mNetfw = new VBoxNetworkFramework();
-    connect (mNetfw, SIGNAL (netBegin (int)),
-             SLOT (onNetBegin (int)));
-    connect (mNetfw, SIGNAL (netData (const QByteArray&)),
-             SLOT (onNetData (const QByteArray&)));
-    connect (mNetfw, SIGNAL (netEnd (const QByteArray&)),
-             SLOT (onNetEnd (const QByteArray&)));
-    connect (mNetfw, SIGNAL (netError (const QString&)),
-             SLOT (onNetError (const QString&)));
-    mTimeout->start (MaxWaitTime);
-    mNetfw->postRequest (aHost, aUrl, aBody);
-}
-
-/* This wrapper displays an error message box (unless aReason is
- * QString::null) with the cause of the request-send procedure
- * termination. After the message box is dismissed, the downloader signals
- * to close itself on the next event loop iteration. */
-void VBoxRegistrationDlg::abortRegisterRequest (const QString &aReason)
-{
-    /* Protect against double kill request. */
-    if (mSuicide) return;
-    mSuicide = true;
-
+/* This wrapper displays an error message box (unless aReason is QString::null)
+ * with the cause of the request-send procedure termination. After the message
+ * box dismissed, the registration dialog signals to close itself on the next
+ * event loop iteration. */
+void VBoxRegistrationDlg::abortRequest (const QString &aReason)
+{
     if (!aReason.isNull())
         vboxProblem().cannotConnectRegister (this, mUrl.toString(), aReason);
@@ -479 +410 @@
 {
     VBoxRegistrationData regData (mLeName->text(), mLeEmail->text(),
-        mCbUse->isChecked() ? "yes" : "no");
+                                  mCbUse->isChecked() ? "yes" : "no");
     vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_RegistrationData,
                                             regData.data());

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxUpdateDlg.cpp

@@ -22 +22 @@
 
 /* Common includes */
-#include "VBoxUpdateDlg.h"
+#include "QIHttp.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxNetworkFramework.h"
+#include "VBoxUpdateDlg.h"
 
 /* Qt includes */
 #include <QTimer>
-
-/* Time to auto-disconnect if no network answer received. */
-static const int MaxWaitTime = 20000;
-
 
 /* VBoxVersion stuff */
@@ -53 +49 @@
     bool operator< (const VBoxVersion &aOther) const
     {
-        return x <  aOther.x ||
+        return (x <  aOther.x) ||
                (x == aOther.x && y <  aOther.y) ||
                (x == aOther.x && y == aOther.y && z <  aOther.z);
@@ -72 +68 @@
 
 /* VBoxUpdateData stuff */
-QList<UpdateDay> VBoxUpdateData::mDayList = QList<UpdateDay>();
+QList <UpdateDay> VBoxUpdateData::mDayList = QList <UpdateDay>();
 
 void VBoxUpdateData::populate()
@@ -121 +117 @@
 bool VBoxUpdateData::isNecessary()
 {
-    return mIndex != NeverCheck &&
-           QDate::currentDate() >= mDate;
+    return mIndex != NeverCheck && QDate::currentDate() >= mDate;
 }
 
@@ -215 +210 @@
 }
 
-VBoxUpdateDlg::VBoxUpdateDlg (VBoxUpdateDlg **aSelf, bool aForceRun,
-                              QWidget *aParent, Qt::WindowFlags aFlags)
-    : QIWithRetranslateUI2<QIAbstractWizard> (aParent, aFlags)
+VBoxUpdateDlg::VBoxUpdateDlg (VBoxUpdateDlg **aSelf, bool aForceRun, QWidget *aParent)
+    : QIWithRetranslateUI <QIAbstractWizard> (aParent)
     , mSelf (aSelf)
-    , mNetfw (0)
-    , mTimeout (new QTimer (this))
     , mUrl ("http://update.virtualbox.org/query.php")
+    , mHttp (new QIHttp (this, mUrl.host()))
     , mForceRun (aForceRun)
-    , mSuicide (false)
 {
     /* Store external pointer to this dialog. */
@@ -231 +223 @@
     Ui::VBoxUpdateDlg::setupUi (this);
 
+    /* Apply window icons */
+    setWindowIcon (vboxGlobal().iconSetFull (QSize (32, 32), QSize (16, 16),
+                                             ":/refresh_32px.png", ":/refresh_16px.png"));
+
     /* Initialize wizard hdr */
     initializeWizardHdr();
 
-    /* Network outage - single shot timer */
-    mTimeout->setSingleShot (true);
-
     /* Setup other connections */
-    connect (mTimeout, SIGNAL (timeout()), this, SLOT (processTimeout()));
     connect (mBtnCheck, SIGNAL (clicked()), this, SLOT (search()));
 
@@ -245 +237 @@
 
     /* Setup initial condition */
-    mPbCheck->setMinimumWidth (mLogoUpdate->width() +
-                               mLogoUpdate->frameWidth() * 2);
+    mPbCheck->setMinimumWidth (mLogoUpdate->width() + mLogoUpdate->frameWidth() * 2);
     mPbCheck->hide();
-
     mTextSuccessInfo->hide();
     mTextFailureInfo->hide();
@@ -259 +249 @@
 VBoxUpdateDlg::~VBoxUpdateDlg()
 {
-    /* Delete network framework. */
-    delete mNetfw;
-
     /* Erase dialog handle in config file. */
-    vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_UpdateDlgWinID,
-                                            QString::null);
+    vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_UpdateDlgWinID, QString::null);
 
     /* Erase external pointer to this dialog. */
@@ -270 +256 @@
 }
 
+void VBoxUpdateDlg::retranslateUi()
+{
+    /* Translate uic generated strings */
+    Ui::VBoxUpdateDlg::retranslateUi (this);
+
+#if 0 /* All the text constants */
+    setWindowTitle (tr ("VirtualBox Update Wizard"));
+
+    mPageUpdateHdr->setText (tr ("Check for Updates"));
+    mBtnCheck->setText (tr ("Chec&k"));
+    mBtnCancel->setText (tr ("Cancel"));
+
+    mPageFinishHdr->setText (tr ("Summary"));
+    mBtnFinish->setText (tr ("&Close"));
+
+    mTextUpdateInfo->setText (tr ("<p>This wizard will connect to the VirtualBox "
+                                  "web-site and check if a newer version of "
+                                  "VirtualBox is available.</p><p>Use the "
+                                  "<b>Check</b> button to check for a new version "
+                                  "now or the <b>Cancel</b> button if you do not "
+                                  "want to perform this check.</p><p>You can run "
+                                  "this wizard at any time by choosing <b>Check "
+                                  "for Updates...</b> from the <b>Help</b> menu.</p>"));
+
+    mTextSuccessInfo->setText (tr ("<p>A new version of VirtualBox has been released! "
+                                   "Version <b>%1</b> is available at "
+                                   "<a href=\"http://www.virtualbox.org/\">virtualbox.org</a>.</p>"
+                                   "<p>You can download this version from this direct link:</p>"
+                                   "<p><a href=%2>%3</a></p>"));
+
+    mTextFailureInfo->setText (tr ("<p>Unable to obtain the new version information "
+                                   "due to the following network error:</p><p><b>%1</b></p>"));
+
+    mTextNotFoundInfo->setText (tr ("You have already installed the latest VirtualBox "
+                                    "version. Please repeat the version check later."));
+#endif
+}
+
 void VBoxUpdateDlg::accept()
 {
     /* Recalculate new update data */
     VBoxUpdateData oldData (vboxGlobal().virtualBox().
-        GetExtraData (VBoxDefs::GUI_UpdateDate));
+                            GetExtraData (VBoxDefs::GUI_UpdateDate));
     VBoxUpdateData newData (oldData.index());
     vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_UpdateDate,
@@ -284 +308 @@
 void VBoxUpdateDlg::search()
 {
-    /* Create & setup network framework */
-    mNetfw = new VBoxNetworkFramework();
-    connect (mNetfw, SIGNAL (netBegin (int)),
-             SLOT (onNetBegin (int)));
-    connect (mNetfw, SIGNAL (netData (const QByteArray&)),
-             SLOT (onNetData (const QByteArray&)));
-    connect (mNetfw, SIGNAL (netEnd (const QByteArray&)),
-             SLOT (onNetEnd (const QByteArray&)));
-    connect (mNetfw, SIGNAL (netError (const QString&)),
-             SLOT (onNetError (const QString&)));
-
+    /* Calculate the count of checks left */
+    int count = 1;
+    QString sc = vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateCheckCount);
+    if (!sc.isEmpty())
+    {
+        bool ok = false;
+        int c = sc.toLongLong (&ok);
+        if (ok) count = c;
+    }
+
+    /* Compose query */
+    QUrl url (mUrl);
+    url.addQueryItem ("platform", vboxGlobal().virtualBox().GetPackageType());
+    url.addQueryItem ("version", QString ("%1_%2").arg (vboxGlobal().virtualBox().GetVersion())
+                                                  .arg (vboxGlobal().virtualBox().GetRevision()));
+    url.addQueryItem ("count", QString::number (count));
+
+    QString userAgent (QString ("VirtualBox %1 <%2>")
+                                .arg (vboxGlobal().virtualBox().GetVersion())
+                                .arg (vboxGlobal().platformInfo()));
+
+    /* Show progress bar */
+    mPbCheck->show();
+
+    /* Send composed information */
+    QHttpRequestHeader header ("POST", url.toEncoded());
+    header.setValue ("Host", url.host());
+    header.setValue ("User-Agent", userAgent);
+    mHttp->disconnect (this);
+    connect (mHttp, SIGNAL (allIsDone (bool)), this, SLOT (searchResponse (bool)));
+    mHttp->request (header);
+}
+
+void VBoxUpdateDlg::searchResponse (bool aError)
+{
+    /* Block all the other incoming signals */
+    mHttp->disconnect (this);
+
+    /* Process error if present */
+    if (aError)
+        return abortRequest (mHttp->errorString());
+
+    /* Hide progress bar */
+    mPbCheck->hide();
+
+    /* Parse incoming data */
+    QString responseData (mHttp->readAll());
+
+    if (responseData.indexOf (QRegExp ("^\\d+\\.\\d+\\.\\d+ \\S+$")) == 0)
+    {
+        /* Newer version of necessary package found */
+        QStringList response = responseData.split (" ", QString::SkipEmptyParts);
+
+        if (isHidden())
+        {
+            /* For background update */
+            vboxProblem().showUpdateSuccess (vboxGlobal().mainWindow(),
+                                             response [0], response [1]);
+            QTimer::singleShot (0, this, SLOT (accept()));
+        }
+        else
+        {
+            /* For wizard update */
+            mTextSuccessInfo->setText (mTextSuccessInfo->text()
+                                       .arg (response [0], response [1], response [1]));
+            mTextSuccessInfo->show();
+            mPageStack->setCurrentIndex (1);
+        }
+    }
+    else /* if (responseData == "UPTODATE") */
+    {
+        /* No newer version of necessary package found */
+        if (isHidden())
+        {
+            /* For background update */
+            if (mForceRun)
+                vboxProblem().showUpdateNotFound (vboxGlobal().mainWindow());
+            QTimer::singleShot (0, this, SLOT (accept()));
+        }
+        else
+        {
+            /* For wizard update */
+            mTextNotFoundInfo->show();
+            mPageStack->setCurrentIndex (1);
+        }
+    }
+
+    /* Save left count of checks */
     int count = 1;
     bool ok = false;
     QString sc = vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateCheckCount);
     if (!sc.isEmpty())
-    {
-        int c = sc.toLongLong(&ok);
-        if (ok)
-            count = c;
-    }
-    QString package = vboxGlobal().virtualBox().GetPackageType();
-    QString version = vboxGlobal().virtualBox().GetVersion();
-    QString revision = QString::number (vboxGlobal().virtualBox().GetRevision());
-    package = QUrl::toPercentEncoding (package);
-    version = QUrl::toPercentEncoding (version);
-    revision = QUrl::toPercentEncoding (revision);
-    QString body;
-    body += QString ("platform=%1").arg (package);
-    body += QString ("&version=%1_%2").arg (version).arg (revision);
-    body += QString ("&count=%1").arg (count);
-
-    QStringList header ("User-Agent");
-    header << QString ("VirtualBox %1 <%2>")
-              .arg (vboxGlobal().virtualBox().GetVersion())
-              .arg (vboxGlobal().platformInfo());
-
-    /* Show progress bar & send composed information */
-    mPbCheck->show();
-    mTimeout->start (MaxWaitTime);
-    mNetfw->postRequest (mUrl.host(), mUrl.path(), body, header);
-}
-
-void VBoxUpdateDlg::retranslateUi()
-{
-    /* Translate uic generated strings */
-    Ui::VBoxUpdateDlg::retranslateUi (this);
-}
-
-void VBoxUpdateDlg::processTimeout()
-{
-    networkAbort (tr ("Connection timed out."));
-}
-
-/* Handles the network request begining. */
-void VBoxUpdateDlg::onNetBegin (int aStatus)
-{
-    if (mSuicide) return;
-
-    if (aStatus == 404)
-        networkAbort (tr ("Could not locate the latest version "
-            "list on the server (response: %1).").arg (aStatus));
-    else
-        mTimeout->start (MaxWaitTime);
-}
-
-/* Handles the network request data incoming. */
-void VBoxUpdateDlg::onNetData (const QByteArray&)
-{
-    if (mSuicide) return;
-
-    mTimeout->start (MaxWaitTime);
-}
-
-/* Handles the network request end. */
-void VBoxUpdateDlg::onNetEnd (const QByteArray &aTotalData)
-{
-    if (mSuicide) return;
-
-    mTimeout->stop();
-    processResponse (aTotalData);
-}
-
-/* Handles the network error. */
-void VBoxUpdateDlg::onNetError (const QString &aError)
-{
-    networkAbort (aError);
+        count = sc.toLongLong (&ok);
+    vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_UpdateCheckCount,
+                                            QString ("%1").arg ((qulonglong) count + 1));
 }
 
@@ -380 +413 @@
 }
 
-void VBoxUpdateDlg::networkAbort (const QString &aReason)
-{
-    /* Protect against double kill request. */
-    if (mSuicide) return;
-    mSuicide = true;
-
+void VBoxUpdateDlg::abortRequest (const QString &aReason)
+{
     /* Hide progress bar */
     mPbCheck->hide();
@@ -405 +434 @@
 }
 
-void VBoxUpdateDlg::processResponse (const QString &aResponse)
-{
-    /* Hide progress bar */
-    mPbCheck->hide();
-
-    if (aResponse.indexOf (QRegExp ("^\\d+\\.\\d+\\.\\d+ \\S+$")) == 0)
-    {
-        /* Newer version of necessary package found */
-        QStringList response = aResponse.split (" ", QString::SkipEmptyParts);
-
-        if (isHidden())
-        {
-            /* For background update */
-            vboxProblem().showUpdateSuccess (vboxGlobal().mainWindow(),
-                response [0], response [1]);
-            QTimer::singleShot (0, this, SLOT (accept()));
-        }
-        else
-        {
-            /* For wizard update */
-            mTextSuccessInfo->setText (mTextSuccessInfo->text()
-                .arg (response [0], response [1], response [1]));
-            mTextSuccessInfo->show();
-            mPageStack->setCurrentIndex (1);
-        }
-    }
-    else /* if (aResponse == "UPTODATE") */
-    {
-        /* No newer version of necessary package found */
-        if (isHidden())
-        {
-            /* For background update */
-            if (mForceRun)
-                vboxProblem().showUpdateNotFound (vboxGlobal().mainWindow());
-            QTimer::singleShot (0, this, SLOT (accept()));
-        }
-        else
-        {
-            /* For wizard update */
-            mTextNotFoundInfo->show();
-            mPageStack->setCurrentIndex (1);
-        }
-    }
-
-    int count = 1;
-    bool ok = false;
-    QString sc = vboxGlobal().virtualBox().GetExtraData (VBoxDefs::GUI_UpdateCheckCount);
-    if (!sc.isEmpty())
-        count = sc.toLongLong(&ok);
-    vboxGlobal().virtualBox().SetExtraData (VBoxDefs::GUI_UpdateCheckCount,
-                                            QString ("%1").arg ((qulonglong) count + 1));
-}
-

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxRegistrationDlg.ui

@@ -30 +30 @@
    <string>VirtualBox Registration Dialog</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../VirtualBox.qrc" >:/register_16px.png</iconset>
-  </property>
   <layout class="QVBoxLayout" >
    <property name="leftMargin" >

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxUpdateDlg.ui

@@ -27 +27 @@
    </rect>
   </property>
-  <property name="windowTitle" >
-   <string>VirtualBox Update Wizard</string>
-  </property>
-  <property name="windowIcon" >
-   <iconset resource="../VirtualBox.qrc" >:/refresh_16px.png</iconset>
-  </property>
   <layout class="QVBoxLayout" >
    <property name="leftMargin" >
@@ -63 +57 @@
           </font>
          </property>
-         <property name="text" >
-          <string>Check for Updates</string>
-         </property>
         </widget>
        </item>
@@ -112 +103 @@
               </size>
              </property>
-             <property name="text" >
-              <string>&lt;p>This wizard will connect to the VirtualBox web-site and check if a newer version of VirtualBox is available.&lt;/p>
-&lt;p>Use the &lt;b>Check&lt;/b> button to check for a new version now or the &lt;b>Cancel&lt;/b> button if you do not want to perform this check.&lt;/p>
-&lt;p>You can run this wizard at any time by choosing &lt;b>Check for Updates...&lt;/b> from the &lt;b>Help&lt;/b> menu.&lt;/p></string>
-             </property>
              <property name="wordWrap" >
               <bool>true</bool>
@@ -188 +174 @@
          <item>
           <widget class="QPushButton" name="mBtnCheck" >
-           <property name="text" >
-            <string>Chec&amp;k</string>
-           </property>
            <property name="default" >
             <bool>true</bool>
@@ -213 +196 @@
          </item>
          <item>
-          <widget class="QPushButton" name="mBtnCancel" >
-           <property name="text" >
-            <string>Cancel</string>
-           </property>
-          </widget>
+          <widget class="QPushButton" name="mBtnCancel" />
          </item>
         </layout>
@@ -235 +214 @@
           </font>
          </property>
-         <property name="text" >
-          <string>Summary</string>
-         </property>
         </widget>
        </item>
@@ -288 +264 @@
                  <height>0</height>
                 </size>
-               </property>
-               <property name="text" >
-                <string>&lt;p>A new version of VirtualBox has been released! Version &lt;b>%1&lt;/b> is available at &lt;a href="http://www.virtualbox.org/">virtualbox.org&lt;/a>.&lt;/p>&lt;p>You can download this version from this direct link:&lt;/p>&lt;p>&lt;a href=%2>%3&lt;/a>&lt;/p></string>
                </property>
                <property name="wordWrap" >
@@ -311 +284 @@
                 </size>
                </property>
-               <property name="text" >
-                <string>&lt;p>Unable to obtain the new version information due to the following network error:&lt;/p>&lt;p>&lt;b>%1&lt;/b>&lt;/p></string>
-               </property>
                <property name="wordWrap" >
                 <bool>true</bool>
@@ -333 +303 @@
                 </size>
                </property>
-               <property name="text" >
-                <string>You have already installed the latest VirtualBox version. Please repeat the version check later.</string>
-               </property>
                <property name="wordWrap" >
                 <bool>true</bool>
@@ -387 +354 @@
          <item>
           <widget class="QPushButton" name="mBtnFinish" >
-           <property name="text" >
-            <string>&amp;Close</string>
-           </property>
            <property name="default" >
             <bool>true</bool>