Changeset 38421 in vbox

Timestamp:

Aug 11, 2011 2:55:02 PM (14 years ago)

Author:

vboxsync

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

73462

Message:

FE/Qt: 5800: Rework GUI networking support to use latest Qt networking classes: Networking stuff moved into the src/net sub-folder. Global UINetworkManager created. It will be used by all the downloaders and other network purposes.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• nls/VirtualBox_ja.ts (modified) (5 diffs)
• src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• src/net (added)
• src/net/UIDownloader.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp ) (4 diffs)
• src/net/UIDownloader.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.h ) (2 diffs)
• src/net/UIDownloaderAdditions.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderAdditions.cpp )
• src/net/UIDownloaderAdditions.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderAdditions.h )
• src/net/UIDownloaderUserManual.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.cpp )
• src/net/UIDownloaderUserManual.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloaderUserManual.h )
• src/net/UINetworkManager.cpp (added)
• src/net/UINetworkManager.h (added)

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

@@ -185 +185 @@
         ./src/wizards/importappliance \
         ./src/widgets \
+        ./src/net \
         ./src/selector \
         ./src/runtime \
@@ -336 +337 @@
         src/widgets/UIBar.h \
         src/widgets/UIBootTable.h \
-        src/widgets/UIDownloader.h \
-        src/widgets/UIDownloaderAdditions.h \
-        src/widgets/UIDownloaderUserManual.h \
         src/widgets/UIHotKeyEditor.h \
         src/widgets/UIPopupBox.h \
@@ -354 +352 @@
         src/widgets/VBoxOSTypeSelectorWidget.h \
         src/widgets/VBoxWarningPane.h \
+        src/net/UINetworkManager.h \
+        src/net/UIDownloader.h \
+        src/net/UIDownloaderAdditions.h \
+        src/net/UIDownloaderUserManual.h \
         src/selector/UIActionPoolSelector.h \
         src/selector/UIVMDesktop.h \
@@ -507 +509 @@
         src/widgets/UIBar.cpp \
         src/widgets/UIBootTable.cpp \
-        src/widgets/UIDownloader.cpp \
-        src/widgets/UIDownloaderAdditions.cpp \
-        src/widgets/UIDownloaderUserManual.cpp \
         src/widgets/UIHotKeyEditor.cpp \
         src/widgets/UIPopupBox.cpp \
@@ -526 +525 @@
         src/widgets/VBoxOSTypeSelectorWidget.cpp \
         src/widgets/VBoxWarningPane.cpp \
+        src/net/UINetworkManager.cpp \
+        src/net/UIDownloader.cpp \
+        src/net/UIDownloaderAdditions.cpp \
+        src/net/UIDownloaderUserManual.cpp \
         src/selector/UIActionPoolSelector.cpp \
         src/selector/UISelectorShortcuts.cpp \

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts

@@ -1178 +1178 @@
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloader.cpp" line="262"/>
+        <location filename="../src/net/UIDownloader.cpp" line="262"/>
         <source>The download process has been canceled by the user.</source>
         <translation>ダウンロード処理がユーザーによってキャンセルされました。</translation>
@@ -1198 +1198 @@
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderAdditions.cpp" line="120"/>
+        <location filename="../src/net/UIDownloaderAdditions.cpp" line="120"/>
         <source>&lt;p&gt;Failed to save the downloaded file as &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;.&lt;/nobr&gt;&lt;/p&gt;</source>
         <translation>&lt;p&gt;ダウンロードしたファイル(&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;)の保存に失敗しました。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderAdditions.cpp" line="126"/>
+        <location filename="../src/net/UIDownloaderAdditions.cpp" line="107"/>
         <source>Select folder to save Guest Additions image to</source>
         <translation>Guest Additionsイメージを保存するフォルダを選択</translation>
@@ -1211 +1211 @@
     <name>UIDownloaderUserManual</name>
     <message>
-        <location filename="../src/widgets/UIDownloaderUserManual.cpp" line="151"/>
+        <location filename="../src/net/UIDownloaderUserManual.cpp" line="137"/>
         <source>Select folder to save User Manual to</source>
         <translation>ユーザーマニュアルを保存するフォルダを選択</translation>
@@ -5360 +5360 @@
     <name>UIMiniProcessWidgetAdditions</name>
     <message>
-        <location filename="../src/widgets/UIDownloaderAdditions.h" line="46"/>
+        <location filename="../src/net/UIDownloaderAdditions.h" line="46"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderAdditions.h" line="47"/>
+        <location filename="../src/net/UIDownloaderAdditions.h" line="47"/>
         <source>Cancel the VirtualBox Guest Additions CD image download</source>
         <translation>VirtualBox Guest Additions CDイメージのダウンロードをキャンセル</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderAdditions.h" line="49"/>
+        <location filename="../src/net/UIDownloaderAdditions.h" line="49"/>
         <source>Downloading the VirtualBox Guest Additions CD image from &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</source>
         <translation>VirtualBox Guest Additions CDイメージを&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;からダウンロード...&lt;/nobr&gt;</translation>
@@ -5378 +5378 @@
     <name>UIMiniProcessWidgetUserManual</name>
     <message>
-        <location filename="../src/widgets/UIDownloaderUserManual.h" line="53"/>
+        <location filename="../src/net/UIDownloaderUserManual.h" line="53"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderUserManual.h" line="54"/>
+        <location filename="../src/net/UIDownloaderUserManual.h" line="54"/>
         <source>Cancel the VirtualBox User Manual download</source>
         <translation>VirtualBox ユーザーマニュアルのダウンロードをキャンセル</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderUserManual.h" line="55"/>
+        <location filename="../src/net/UIDownloaderUserManual.h" line="55"/>
         <source>Downloading the VirtualBox User Manual</source>
         <translation>VirtualBox ユーザーマニュアルのダウンロード</translation>
     </message>
     <message>
-        <location filename="../src/widgets/UIDownloaderUserManual.h" line="56"/>
+        <location filename="../src/net/UIDownloaderUserManual.h" line="56"/>
         <source>Downloading the VirtualBox User Manual &lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;...&lt;/nobr&gt;</source>
         <translation>VirtualBox ユーザーマニュアルを&lt;nobr&gt;&lt;b&gt;%1&lt;/b&gt;からダウンロード...&lt;/nobr&gt;</translation>

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -31 +31 @@
 #include "UIExtraDataEventHandler.h"
 #include "QIFileDialog.h"
+#include "UINetworkManager.h"
 
 #include "UIMachine.h"
@@ -5242 +5243 @@
     /* Handle global settings change for the first time: */
     sltProcessGlobalSettingChange();
+
+    /* Create network manager: */
+    UINetworkManager::create();
 }
 
@@ -5252 +5256 @@
 void VBoxGlobal::cleanup()
 {
+    /* Destroy network manager: */
+    UINetworkManager::destroy();
+
     /* sanity check */
     if (!sVBoxGlobalInCleanup)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp

@@ -24 +24 @@
 /* Local includes: */
 #include "UIDownloader.h"
+#include "UINetworkManager.h"
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
@@ -123 +124 @@
 
 UIDownloader::UIDownloader()
-    : m_pNetworkManager(new QNetworkAccessManager(this))
 {
     connect(this, SIGNAL(sigToStartAcknowledging()), this, SLOT(sltStartAcknowledging()), Qt::QueuedConnection);
@@ -135 +135 @@
     QNetworkRequest request;
     request.setUrl(m_source);
-    QNetworkReply *pReply = m_pNetworkManager->head(request);
+    QNetworkReply *pReply = gNetworkManager->head(request);
     connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors()));
     connect(pReply, SIGNAL(finished()), this, SLOT(sltFinishAcknowledging()));
@@ -188 +188 @@
     QNetworkRequest request;
     request.setUrl(m_source);
-    QNetworkReply *pReply = m_pNetworkManager->get(request);
+    QNetworkReply *pReply = gNetworkManager->get(request);
     connect(pReply, SIGNAL(sslErrors(QList<QSslError>)), pReply, SLOT(ignoreSslErrors()));
     connect(pReply, SIGNAL(downloadProgress(qint64, qint64)), this, SIGNAL(sigDownloadProgress(qint64, qint64)));

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.h

@@ -28 +28 @@
 class QProgressBar;
 class UIMiniCancelButton;
-class QNetworkAccessManager;
 class QNetworkReply;
 
@@ -167 +166 @@
 
     /* Private variables: */
-    QNetworkAccessManager *m_pNetworkManager;
     QUrl m_source;
     QString m_strTarget;