Changeset 41153 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 3, 2012 10:23:07 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: 5956: Network/Update Managers stuff: Never show Network Manager UI for an automatic-update case. Do not propose to cancel all the current network operations on Network Manager UI close-event.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• net/UINetworkCustomer.cpp (modified) (1 diff)
• net/UINetworkCustomer.h (modified) (2 diffs)
• net/UINetworkManager.cpp (modified) (3 diffs)
• net/UIUpdateManager.cpp (modified) (7 diffs)

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

@@ -1949 +1949 @@
 }
 
-bool UIMessageCenter::askAboutCancelOrLeaveAllNetworkRequest(QWidget *pParent)
-{
-    return messageYesNo(pParent, Question, tr("Do you wish to cancel all current network operations or leave them running in the background?"),
-                        0 /* auto-confirm id */, tr("Cancel All"), tr("Leave in Background"));
-}
-
 /**
  *  @return @c true if the user has confirmed input capture (this is always

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -327 +327 @@
 
     bool askAboutCancelAllNetworkRequest(QWidget *pParent);
-    bool askAboutCancelOrLeaveAllNetworkRequest(QWidget *pParent);
 
     bool confirmInputCapture(bool *pfAutoConfirmed = NULL);

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

@@ -25 +25 @@
 #include "UINetworkManager.h"
 
-UINetworkCustomer::UINetworkCustomer(QObject *pParent /* = 0 */)
+UINetworkCustomer::UINetworkCustomer()
+    : QObject(0)
+    , m_fForceCall(true)
+{
+}
+
+UINetworkCustomer::UINetworkCustomer(QObject *pParent, bool fForceCall)
     : QObject(pParent)
+    , m_fForceCall(fForceCall)
 {
 }

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

@@ -37 +37 @@
 public:
 
-    /* Constructor: */
-    UINetworkCustomer(QObject *pParent = 0);
+    /* Constructors: */
+    UINetworkCustomer();
+    UINetworkCustomer(QObject *pParent, bool fForceCall);
+
+    /* Getters: */
+    bool isItForceCall() const { return m_fForceCall; }
 
     /* Network-reply progress handler: */
@@ -53 +57 @@
     /* Network-request wrapper (set): */
     void createNetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription);
+
+private:
+
+    /* Variables: */
+    bool m_fForceCall;
 };
 

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

@@ -335 +335 @@
         /* Show button-box: */
         m_pButtonBox->setHidden(false);
-        /* Show dialog: */
-        showNormal();
+        /* If customer made a force-call: */
+        if (pNetworkRequest->customer()->isItForceCall())
+        {
+            /* Show dialog: */
+            showNormal();
+        }
 
         /* Return network-request widget: */
@@ -401 +405 @@
         /* Pass event to the base-class: */
         QMainWindow::showEvent(pShowEvent);
-    }
-
-    /* Overloaded close-event: */
-    void closeEvent(QCloseEvent *pCloseEvent)
-    {
-        /* If there are network-requests present
-         * ask if user wants to cancel all current network-requests
-         * or leave them working at the background: */
-        if (!m_widgets.isEmpty() &&
-            msgCenter().askAboutCancelOrLeaveAllNetworkRequest(this))
-            emit sigCancelNetworkRequests();
-
-        /* Pass event to the base-class: */
-        QMainWindow::closeEvent(pCloseEvent);
     }
 
@@ -854 +844 @@
 
 /* Slot to handle network-request failure: */
-void UINetworkManager::sltHandleNetworkRequestFailure(const QUuid &uuid, const QString &strError)
-{
-    /* Just show the dialog: */
-    show();
-    Q_UNUSED(uuid);
-    Q_UNUSED(strError);
+void UINetworkManager::sltHandleNetworkRequestFailure(const QUuid &uuid, const QString &)
+{
+    /* Make sure corresponding map contains received ID: */
+    AssertMsg(m_requests.contains(uuid), ("Network-request NOT found!\n"));
+
+    /* Get corresponding network-request: */
+    UINetworkRequest *pNetworkRequest = m_requests.value(uuid);
+
+    /* Get corresponding customer: */
+    UINetworkCustomer *pNetworkCustomer = pNetworkRequest->customer();
+
+    /* If customer made a force-call: */
+    if (pNetworkCustomer->isItForceCall())
+    {
+        /* Just show the dialog: */
+        show();
+    }
 }
 

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

@@ -91 +91 @@
 
     /* Constructor: */
-    UIUpdateStep(UIUpdateQueue *pQueue) : UINetworkCustomer(pQueue)
+    UIUpdateStep(UIUpdateQueue *pQueue, bool fForceCall) : UINetworkCustomer(pQueue, fForceCall)
     {
         /* If queue has no steps yet: */
@@ -140 +140 @@
     /* Constructor: */
     UIUpdateStepVirtualBox(UIUpdateQueue *pQueue, bool fForceCall)
-        : UIUpdateStep(pQueue)
+        : UIUpdateStep(pQueue, fForceCall)
         , m_url("http://update.virtualbox.org/query.php")
-        , m_fForceCall(fForceCall)
     {
     }
@@ -217 +216 @@
         else
         {
-            if (m_fForceCall)
+            if (isItForceCall())
                 msgCenter().showUpdateNotFound();
         }
@@ -240 +239 @@
     /* Variables: */
     QUrl m_url;
-    bool m_fForceCall;
 };
 
@@ -251 +249 @@
 
     /* Constructor: */
-    UIUpdateStepVirtualBoxExtensionPack(UIUpdateQueue *pQueue)
-        : UIUpdateStep(pQueue)
+    UIUpdateStepVirtualBoxExtensionPack(UIUpdateQueue *pQueue, bool fForceCall)
+        : UIUpdateStep(pQueue, fForceCall)
     {
     }
@@ -395 +393 @@
 void UIUpdateManager::sltCheckIfUpdateIsNecessary(bool fForceCall /* = false */)
 {
-    /* If already running => just open Network Access Manager GUI: */
+    /* If already running: */
     if (m_fIsRunning)
     {
-        gNetworkManager->show();
+        /* And we have a force-call: */
+        if (fForceCall)
+        {
+            /* Just show Network Access Manager: */
+            gNetworkManager->show();
+        }
         return;
     }
@@ -413 +416 @@
         /* Prepare update queue: */
         new UIUpdateStepVirtualBox(m_pQueue, fForceCall);
-        new UIUpdateStepVirtualBoxExtensionPack(m_pQueue);
+        new UIUpdateStepVirtualBoxExtensionPack(m_pQueue, fForceCall);
         /* Start update queue: */
         m_pQueue->start();