Changeset 7722 in vbox

Timestamp:

Apr 3, 2008 12:50:45 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Ported this one also.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxDownloaderWgt.h (modified) (2 diffs)
• src/VBoxDownloaderWgt.cpp (modified) (14 diffs)

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

@@ -21 +21 @@
 
 #include "HappyHttp.h"
-#include "qwidget.h"
-#include "q3url.h"
-#include "qmutex.h"
-//Added by qt3to4:
-#include <QEvent>
+
+/* Qt includes */
+#include <QWidget>
+#include <QUrl>
+#include <QMutex>
+
 class QStatusBar;
 class QAction;
-class Q3ProgressBar;
+class QProgressBar;
 class QToolButton;
 class QThread;
@@ -88 +89 @@
     void abortConnection();
 
-    Q3Url mUrl;
+    QUrl mUrl;
     QString mTarget;
     QStatusBar *mStatusBar;
     QAction *mAction;
-    Q3ProgressBar *mProgressBar;
+    QProgressBar *mProgressBar;
     QToolButton *mCancelButton;
     bool mIsChecking;

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

@@ -22 +22 @@
 #include "VBoxDownloaderWgt.h"
 
-#include "qaction.h"
-#include "q3progressbar.h"
-#include "qtoolbutton.h"
-#include "qlayout.h"
-#include "qstatusbar.h"
-#include "qdir.h"
-#include "qtimer.h"
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <QEvent>
+/* Qt includes */
+#include <QProgressBar>
+#include <QHBoxLayout>
+#include <QTimer>
+#include <QToolButton>
+#include <QStatusBar>
+#include <QDir>
 
 /* These notifications are used to notify the GUI thread about different
@@ -60 +57 @@
     ProcessDownloadEvent (const char *aData, ulong aSize)
         : QEvent ((QEvent::Type) ProcessDownloadEventType)
-        , mData (QByteArray().duplicate (aData, aSize)) {}
+        , mData (aData, aSize) {}
 
     QByteArray mData;
@@ -125 +122 @@
 VBoxDownloaderWgt::VBoxDownloaderWgt (QStatusBar *aStatusBar, QAction *aAction,
                                       const QString &aUrl, const QString &aTarget)
-    : QWidget (0, "VBoxDownloaderWgt")
+    : QWidget ()
     , mUrl (aUrl), mTarget (aTarget)
     , mStatusBar (aStatusBar), mAction (aAction)
     , mProgressBar (0), mCancelButton (0)
     , mIsChecking (true), mSuicide (false)
-    , mConn (new HConnect (mUrl.host(), 80))
+    , mConn (new HConnect (mUrl.host().toAscii().constData(), 80))
     , mRequestThread (0)
     , mDataStream (&mDataArray, QIODevice::WriteOnly)
@@ -137 +134 @@
     /* Disable the associated action */
     mAction->setEnabled (false);
+    mTimeout->setSingleShot (true);
     connect (mTimeout, SIGNAL (timeout()),
              this, SLOT (processTimeout()));
@@ -143 +141 @@
     setFixedHeight (16);
 
-    mProgressBar = new Q3ProgressBar (this);
+    mProgressBar = new QProgressBar (this);
     mProgressBar->setFixedWidth (100);
-    mProgressBar->setPercentageVisible (true);
-    mProgressBar->setProgress (0);
+    mProgressBar->setFormat ("%p%");
+    mProgressBar->setValue (0);
 
     mCancelButton = new QToolButton (this);
@@ -154 +152 @@
              this, SLOT (processAbort()));
 
-    Q3HBoxLayout *mainLayout = new Q3HBoxLayout (this);
+    QHBoxLayout *mainLayout = new QHBoxLayout (this);
+    mainLayout->setSpacing (0);
+    VBoxGlobal::setLayoutMargin (mainLayout, 0);
     mainLayout->addWidget (mProgressBar);
     mainLayout->addWidget (mCancelButton);
-    mainLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
-                                                QSizePolicy::Fixed));
+    mainLayout->addStretch (1);
 
     /* Prepare the connection */
@@ -164 +163 @@
 
     languageChange();
-    mStatusBar->addWidget (this);
+    mStatusBar->addWidget (this, 1);
 
     /* Try to get the required file for the information */
@@ -174 +173 @@
     mCancelButton->setText (tr ("Cancel"));
     /// @todo the below title should be parametrized
-    QToolTip::add (mProgressBar, tr ("Downloading the VirtualBox Guest Additions "
-                                     "CD image from <nobr><b>%1</b>...</nobr>")
-                                 .arg (mUrl.toString()));
+    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
-    QToolTip::add (mCancelButton, tr ("Cancel the VirtualBox Guest "
-                                      "Additions CD image download"));
+    mCancelButton->setToolTip (tr ("Cancel the VirtualBox Guest "
+                                   "Additions CD image download"));
 }
 
@@ -230 +229 @@
             ProcessDownloadEvent *e = static_cast<ProcessDownloadEvent*> (aEvent);
 
-            mTimeout->start (20000, true);
-            mProgressBar->setProgress (mProgressBar->progress() + e->mData.size());
-            mDataStream.writeRawBytes (e->mData.data(), e->mData.size());
+            mTimeout->start (20000);
+            mProgressBar->setValue (mProgressBar->value() + e->mData.size());
+            mDataStream.writeRawData (e->mData.data(), e->mData.size());
 
             return true;
@@ -246 +245 @@
                 if (file.open (QIODevice::WriteOnly))
                 {
-                    file.writeBlock (mDataArray);
+                    file.write (mDataArray);
                     file.close();
                     /// @todo the below action is not part of the generic
@@ -271 +270 @@
                 /// the title)
                 QString target = vboxGlobal().getExistingDirectory (
-                    QFileInfo (mTarget).dirPath(), this, "selectSaveDir",
+                    QFileInfo (mTarget).absolutePath(), this, "selectSaveDir",
                     tr ("Select folder to save Guest Additions image to"), true);
                 if (target.isNull())
                     QTimer::singleShot (0, this, SLOT (suicide()));
                 else
-                    mTarget = QDir (target).absFilePath (QFileInfo (mTarget).fileName());
+                    mTarget = QDir (target).absoluteFilePath (QFileInfo (mTarget).fileName());
             }
 
@@ -313 +312 @@
             try
             {
-                mConn->request ("GET", mPath);
+                mConn->request ("GET", mPath.toAscii().constData());
                 while (mConn->outstanding())
                 {
@@ -338 +337 @@
         mRequestThread = new Thread (this, mConn, mUrl.path(), &mMutex);
     mRequestThread->start();
-    mTimeout->start (20000, true);
+    mTimeout->start (20000);
 }
 
@@ -356 +355 @@
     {
         mIsChecking = false;
-        mProgressBar->setTotalSteps (aSize);
+        mProgressBar->setMaximum (aSize);
         getFile();
     }