Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30,11 +30,5 @@
 
 
-UINetworkCustomer::UINetworkCustomer()
-    : QObject(0)
-    , m_fForceCall(true)
-{
-}
-
-UINetworkCustomer::UINetworkCustomer(QObject *pParent, bool fForceCall)
+UINetworkCustomer::UINetworkCustomer(QObject *pParent /* = 0 */, bool fForceCall /* = true */)
     : QObject(pParent)
     , m_fForceCall(fForceCall)
@@ -42,8 +36,8 @@
 }
 
-void UINetworkCustomer::createNetworkRequest(UINetworkRequestType type, const QList<QUrl> urls,
+void UINetworkCustomer::createNetworkRequest(UINetworkRequestType enmType, const QList<QUrl> urls,
                                              const UserDictionary requestHeaders /* = UserDictionary() */)
 {
-    gNetworkManager->createNetworkRequest(type, urls, requestHeaders, this);
+    gNetworkManager->createNetworkRequest(enmType, urls, requestHeaders, this);
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,11 +16,11 @@
  */
 
-#ifndef __UINetworkCustomer_h__
-#define __UINetworkCustomer_h__
+#ifndef ___UINetworkCustomer_h___
+#define ___UINetworkCustomer_h___
 
-/* Global includes: */
+/* Qt includes: */
 #include <QObject>
 
-/* Local includes: */
+/* GUI includes: */
 #include "UINetworkDefs.h"
 
@@ -29,5 +29,5 @@
 class QUrl;
 
-/* Interface to access UINetworkManager protected functionality: */
+/** Interface to access UINetworkManager protected functionality. */
 class UINetworkCustomer : public QObject
 {
@@ -36,16 +36,16 @@
 public:
 
-    /* Constructors: */
-    UINetworkCustomer();
-    UINetworkCustomer(QObject *pParent, bool fForceCall);
+    /** Constructs network customer passing @a pParent to the base-class.
+      * @param  fForceCall  Brings whether this customer has forced privelegies. */
+    UINetworkCustomer(QObject *pParent = 0, bool fForceCall = true);
 
-    /* Getters: */
+    /** Returns whether this customer has forced privelegies. */
     bool isItForceCall() const { return m_fForceCall; }
 
-    /* Network-reply progress handler: */
+    /** Handles network reply progress for @a iReceived amount of bytes among @a iTotal. */
     virtual void processNetworkReplyProgress(qint64 iReceived, qint64 iTotal) = 0;
-    /* Network-reply cancel handler: */
+    /** Handles network reply canceling for a passed @a pReply. */
     virtual void processNetworkReplyCanceled(UINetworkReply *pReply) = 0;
-    /* Network-reply finish handler: */
+    /** Handles network reply finishing for a passed @a pReply. */
     virtual void processNetworkReplyFinished(UINetworkReply *pReply) = 0;
 
@@ -56,13 +56,13 @@
 
     /** Creates network-request of the passed @a type on the basis of the passed @a urls and the @a requestHeaders. */
-    void createNetworkRequest(UINetworkRequestType type, const QList<QUrl> urls,
+    void createNetworkRequest(UINetworkRequestType enmType, const QList<QUrl> urls,
                               const UserDictionary requestHeaders = UserDictionary());
 
 private:
 
-    /* Variables: */
+    /** Holds whether this customer has forced privelegies. */
     bool m_fForceCall;
 };
 
-#endif // __UINetworkCustomer_h__
+#endif /* !___UINetworkCustomer_h___ */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,25 +20,25 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes: */
+/* Qt includes: */
 # include <QWidget>
 # include <QUrl>
 
-/* Local includes: */
+/* GUI includes: */
+# include "VBoxGlobal.h"
+# include "UINetworkCustomer.h"
 # include "UINetworkManager.h"
 # include "UINetworkManagerDialog.h"
 # include "UINetworkManagerIndicator.h"
 # include "UINetworkRequest.h"
-# include "UINetworkCustomer.h"
-# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
-UINetworkManager* UINetworkManager::m_pInstance = 0;
+UINetworkManager* UINetworkManager::s_pInstance = 0;
 
 void UINetworkManager::create()
 {
     /* Check that instance do NOT exist: */
-    if (m_pInstance)
+    if (s_pInstance)
         return;
 
@@ -47,5 +47,5 @@
 
     /* Prepare instance: */
-    m_pInstance->prepare();
+    s_pInstance->prepare();
 }
 
@@ -53,20 +53,20 @@
 {
     /* Check that instance exists: */
-    if (!m_pInstance)
+    if (!s_pInstance)
         return;
 
     /* Cleanup instance: */
-    m_pInstance->cleanup();
+    s_pInstance->cleanup();
 
     /* Destroy instance: */
-    delete m_pInstance;
-}
-
-UINetworkManagerDialog* UINetworkManager::window() const
+    delete s_pInstance;
+}
+
+UINetworkManagerDialog *UINetworkManager::window() const
 {
     return m_pNetworkManagerDialog;
 }
 
-UINetworkManagerIndicator* UINetworkManager::createIndicator() const
+UINetworkManagerIndicator *UINetworkManager::createIndicator() const
 {
     /* For Selector UI only: */
@@ -108,9 +108,9 @@
 }
 
-void UINetworkManager::createNetworkRequest(UINetworkRequestType type, const QList<QUrl> &urls,
+void UINetworkManager::createNetworkRequest(UINetworkRequestType enmType, const QList<QUrl> &urls,
                                             const UserDictionary &requestHeaders, UINetworkCustomer *pCustomer)
 {
     /* Create network-request: */
-    UINetworkRequest *pNetworkRequest = new UINetworkRequest(type, urls, requestHeaders, pCustomer, this);
+    UINetworkRequest *pNetworkRequest = new UINetworkRequest(enmType, urls, requestHeaders, pCustomer, this);
     /* Prepare created network-request: */
     prepareNetworkRequest(pNetworkRequest);
@@ -121,5 +121,5 @@
 {
     /* Prepare instance: */
-    m_pInstance = this;
+    s_pInstance = this;
 }
 
@@ -127,5 +127,5 @@
 {
     /* Cleanup instance: */
-    m_pInstance = 0;
+    s_pInstance = 0;
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,6 +16,6 @@
  */
 
-#ifndef __UINetworkManager_h__
-#define __UINetworkManager_h__
+#ifndef ___UINetworkManager_h___
+#define ___UINetworkManager_h___
 
 /* Qt includes: */
@@ -23,5 +23,5 @@
 #include <QUuid>
 
-/* Local inludes: */
+/* GUI inludes: */
 #include "UINetworkDefs.h"
 
@@ -29,11 +29,11 @@
 class QUrl;
 class QWidget;
-class UINetworkRequest;
 class UINetworkCustomer;
 class UINetworkManagerDialog;
 class UINetworkManagerIndicator;
+class UINetworkRequest;
 
-/* QObject class reimplementation.
- * Providing network access for VirtualBox application purposes. */
+/** QObject class extension.
+  * Providing network access for VirtualBox application purposes. */
 class UINetworkManager : public QObject
 {
@@ -42,5 +42,5 @@
 signals:
 
-    /* Ask listeners (network-requests) to cancel: */
+    /** Asks listeners (network-requests) to cancel. */
     void sigCancelNetworkRequests();
 
@@ -52,17 +52,18 @@
 public:
 
-    /* Instance: */
-    static UINetworkManager* instance() { return m_pInstance; }
-
-    /* Create/destroy singleton: */
+    /** Creates singleton instance. */
     static void create();
+    /** Destroys singleton instance. */
     static void destroy();
 
-    /* Pointer to network-manager dialog: */
-    UINetworkManagerDialog* window() const;
+    /** Returns the singleton instance. */
+    static UINetworkManager *instance() { return s_pInstance; }
+
+    /** Returns pointer to network-manager dialog. */
+    UINetworkManagerDialog *window() const;
 
     /** Creates network-manager state-indicator.
       * @remarks To be cleaned up by the caller. */
-    UINetworkManagerIndicator* createIndicator() const;
+    UINetworkManagerIndicator *createIndicator() const;
 
     /** Registers @a pNetworkRequest in network-manager. */
@@ -73,57 +74,62 @@
 public slots:
 
-    /* Show network-manager dialog: */
+    /** Shows network-manager dialog. */
     void show();
 
 protected:
 
-    /* Allow UINetworkCustomer to create network-request: */
+    /** Allows UINetworkCustomer to create network-request. */
     friend class UINetworkCustomer;
+
     /** Creates network-request of the passed @a type
       * on the basis of the passed @a urls and the @a requestHeaders for the @a pCustomer specified. */
-    void createNetworkRequest(UINetworkRequestType type, const QList<QUrl> &urls,
+    void createNetworkRequest(UINetworkRequestType enmType, const QList<QUrl> &urls,
                               const UserDictionary &requestHeaders, UINetworkCustomer *pCustomer);
 
 private:
 
-    /* Constructor/destructor: */
+    /** Constructs network manager. */
     UINetworkManager();
+    /** Destructs network manager. */
     ~UINetworkManager();
 
-    /* Prepare/cleanup: */
+    /** Prepares all. */
     void prepare();
+    /** Cleanups all. */
     void cleanup();
 
-    /* Network-request prepare helper: */
+    /** Prepares @a pNetworkRequest. */
     void prepareNetworkRequest(UINetworkRequest *pNetworkRequest);
-    /* Network-request cleanup helper: */
+    /** Cleanups network-request with passed @a uuid. */
     void cleanupNetworkRequest(QUuid uuid);
-    /* Network-requests cleanup helper: */
+    /** Cleanups all network-requests. */
     void cleanupNetworkRequests();
 
 private slots:
 
-    /* Slot to handle network-request progress: */
+    /** Handles progress for @a iReceived amount of bytes among @a iTotal for request specified by @a uuid. */
     void sltHandleNetworkRequestProgress(const QUuid &uuid, qint64 iReceived, qint64 iTotal);
-    /* Slot to handle network-request cancel: */
+    /** Handles canceling of request specified by @a uuid. */
     void sltHandleNetworkRequestCancel(const QUuid &uuid);
-    /* Slot to handle network-request finish: */
+    /** Handles finishing of request specified by @a uuid. */
     void sltHandleNetworkRequestFinish(const QUuid &uuid);
-    /* Slot to handle network-request failure: */
+    /** Handles @a strError of request specified by @a uuid. */
     void sltHandleNetworkRequestFailure(const QUuid &uuid, const QString &strError);
 
 private:
 
-    /* Instance: */
-    static UINetworkManager *m_pInstance;
+    /** Holds the singleton instance. */
+    static UINetworkManager *s_pInstance;
 
-    /* Network-request map: */
+    /** Holds the map of current requests. */
     QMap<QUuid, UINetworkRequest*> m_requests;
 
-    /* Network-manager dialog: */
+    /** Holds the network manager dialog instance. */
     UINetworkManagerDialog *m_pNetworkManagerDialog;
 };
+
+/** Singleton Network Manager 'official' name. */
 #define gNetworkManager UINetworkManager::instance()
 
-#endif // __UINetworkManager_h__
+#endif /* !___UINetworkManager_h___ */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,5 +20,5 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes: */
+/* Qt includes: */
 # include <QVBoxLayout>
 # include <QLabel>
@@ -27,15 +27,15 @@
 # include <QKeyEvent>
 
-/* Local includes: */
+/* GUI includes: */
+# include "QIDialogButtonBox.h"
+# include "VBoxGlobal.h"
+# include "UIIconPool.h"
+# include "UIMessageCenter.h"
+# include "UIModalWindowManager.h"
+# include "UINetworkCustomer.h"
+# include "UINetworkManager.h"
 # include "UINetworkManagerDialog.h"
-# include "UINetworkManager.h"
 # include "UINetworkRequest.h"
 # include "UINetworkRequestWidget.h"
-# include "UINetworkCustomer.h"
-# include "UIIconPool.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "QIDialogButtonBox.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,23 +16,24 @@
  */
 
-#ifndef __UINetworkManagerDialog_h__
-#define __UINetworkManagerDialog_h__
+#ifndef ___UINetworkManagerDialog_h___
+#define ___UINetworkManagerDialog_h___
 
-/* Global includes: */
+/* Qt includes: */
 #include <QMainWindow>
 #include <QMap>
 #include <QUuid>
 
-/* Local includes: */
+/* GUI includes: */
 #include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
+class QLabel;
+class QUuid;
+class QVBoxLayout;
+class QIDialogButtonBox;
 class UINetworkRequest;
-class QVBoxLayout;
-class QLabel;
-class QIDialogButtonBox;
 class UINetworkRequestWidget;
 
-/* QMainWindow reimplementation to reflect network-requests: */
+/** QMainWindow reimplementation to reflect network-requests. */
 class UINetworkManagerDialog : public QIWithRetranslateUI<QMainWindow>
 {
@@ -41,47 +42,52 @@
 signals:
 
-    /* Ask listener (network-manager) to cancel all network-requests: */
+    /** Asks listener (network-manager) to cancel all network-requests. */
     void sigCancelNetworkRequests();
 
 public slots:
 
-    /* Show the dialog, make sure its visible: */
+    /** Shows the dialog, make sure its visible. */
     void showNormal();
 
 protected:
 
-    /* Allow creation of UINetworkManagerDialog to UINetworkManager: */
+    /** Allows creation of UINetworkManagerDialog to UINetworkManager. */
     friend class UINetworkManager;
-    /* Constructor: */
+    /** Constructs Network Manager Dialog. */
     UINetworkManagerDialog();
 
-    /* Allow adding/removing network-request widgets to UINetworkRequest: */
+    /** Allows adding/removing network-request widgets to UINetworkRequest. */
     friend class UINetworkRequest;
-    /* Add network-request widget: */
+    /** Adds network-request widget. */
     void addNetworkRequestWidget(UINetworkRequest *pNetworkRequest);
-    /* Remove network-request widget: */
+    /** Removes network-request widget. */
     void removeNetworkRequestWidget(const QUuid &uuid);
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
+
+    /** Handles key-press @a pEvent. */
+    virtual void keyPressEvent(QKeyEvent *pEvent) /* override */;
 
 private slots:
 
-    /* Handler for 'Cancel All' button-press: */
+    /** Handles 'Cancel All' button-press. */
     void sltHandleCancelAllButtonPress();
 
 private:
 
-    /* Translation stuff: */
-    void retranslateUi();
-
-    /* Overloaded event-handlers: */
-    void showEvent(QShowEvent *pShowEvent);
-    void keyPressEvent(QKeyEvent *pKeyPressEvent);
-
-    /* Widgets: */
-    QLabel *m_pLabel;
-    QVBoxLayout *m_pWidgetsLayout;
-    QIDialogButtonBox *m_pButtonBox;
-    QMap<QUuid, UINetworkRequestWidget*> m_widgets;
+    /** Holds the label instance. */
+    QLabel                               *m_pLabel;
+    /** Holds the widget layout instance. */
+    QVBoxLayout                          *m_pWidgetsLayout;
+    /** Holds the dialog-button-box instance. */
+    QIDialogButtonBox                    *m_pButtonBox;
+    /** Holds the map of the network request widget instances. */
+    QMap<QUuid, UINetworkRequestWidget*>  m_widgets;
 };
 
-#endif // __UINetworkManagerDialog_h__
+#endif /* !___UINetworkManagerDialog_h___ */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21,8 +21,8 @@
 
 /* GUI includes: */
+# include "VBoxGlobal.h"
+# include "UIIconPool.h"
 # include "UINetworkManagerIndicator.h"
 # include "UINetworkRequest.h"
-# include "UIIconPool.h"
-# include "VBoxGlobal.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -38,159 +38,4 @@
     /* Translate content: */
     retranslateUi();
-}
-
-void UINetworkManagerIndicator::sltAddNetworkManagerIndicatorDescription(UINetworkRequest *pNetworkRequest)
-{
-    /* Make sure network-request is really exists: */
-    AssertMsg(pNetworkRequest, ("Invalid network-request passed!"));
-    /* Make sure network-request was NOT registered yet: */
-    AssertMsg(!m_ids.contains(pNetworkRequest->uuid()), ("Network-request already registered!"));
-
-    /* Append network-request data: */
-    m_ids.append(pNetworkRequest->uuid());
-    m_data.append(UINetworkRequestData(pNetworkRequest->description(), 0, 0));
-
-    /* Prepare network-request listeners: */
-    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&)>(&UINetworkRequest::sigStarted),
-            this, &UINetworkManagerIndicator::sltSetProgressToStarted);
-    connect(pNetworkRequest, &UINetworkRequest::sigCanceled,
-            this, &UINetworkManagerIndicator::sltSetProgressToCanceled);
-    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&)>(&UINetworkRequest::sigFinished),
-            this, &UINetworkManagerIndicator::sltSetProgressToFinished);
-    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&, const QString &)>(&UINetworkRequest::sigFailed),
-            this, &UINetworkManagerIndicator::sltSetProgressToFailed);
-    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&, qint64, qint64)>(&UINetworkRequest::sigProgress),
-            this, &UINetworkManagerIndicator::sltSetProgress);
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sldRemoveNetworkManagerIndicatorDescription(const QUuid &uuid)
-{
-    /* Make sure network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("Network-request already unregistered!"));
-
-    /* Search for network-request index: */
-    int iIndexOfRequiredElement = m_ids.indexOf(uuid);
-
-    /* Delete corresponding network-request: */
-    m_ids.remove(iIndexOfRequiredElement);
-    m_data.remove(iIndexOfRequiredElement);
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sltSetProgressToStarted(const QUuid &uuid)
-{
-    /* Make sure that network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
-
-    /* Search for network-request index: */
-    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
-    /* Update corresponding network-request data: */
-    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
-    data.bytesReceived = 0;
-    data.bytesTotal = 0;
-    data.failed = false;
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sltSetProgressToCanceled(const QUuid &uuid)
-{
-    /* Make sure that network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
-    Q_UNUSED(uuid);
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sltSetProgressToFailed(const QUuid &uuid, const QString &)
-{
-    /* Make sure that network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
-
-    /* Search for network-request index: */
-    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
-    /* Update corresponding data: */
-    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
-    data.failed = true;
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sltSetProgressToFinished(const QUuid &uuid)
-{
-    /* Make sure that network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
-    Q_UNUSED(uuid);
-
-    /* Update appearance: */
-    recalculateIndicatorState();
-}
-
-void UINetworkManagerIndicator::sltSetProgress(const QUuid &uuid, qint64 iReceived, qint64 iTotal)
-{
-    /* Make sure that network-request still registered: */
-    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
-
-    /* Search for network-request index: */
-    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
-    /* Update corresponding network-request data: */
-    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
-    data.bytesReceived = iReceived;
-    data.bytesTotal = iTotal;
-
-    /* Update appearance: */
-    updateAppearance();
-}
-
-void UINetworkManagerIndicator::retranslateUi()
-{
-    /* Update appearance: */
-    updateAppearance();
-}
-
-void UINetworkManagerIndicator::recalculateIndicatorState()
-{
-    /* Check if there are network-requests at all: */
-    if (m_ids.isEmpty())
-    {
-        /* Set state to 'idle': */
-        setState(UINetworkManagerIndicatorState_Idle);
-    }
-    else
-    {
-        /* Check if there is at least one failed network-request: */
-        bool fIsThereAtLeastOneFailedNetworkRequest = false;
-        for (int i = 0; i < m_data.size(); ++i)
-        {
-            if (m_data[i].failed)
-            {
-                fIsThereAtLeastOneFailedNetworkRequest = true;
-                break;
-            }
-        }
-
-        /* If there it least one failed network-request: */
-        if (fIsThereAtLeastOneFailedNetworkRequest)
-        {
-            /* Set state to 'error': */
-            setState(UINetworkManagerIndicatorState_Error);
-        }
-        else
-        {
-            /* Set state to 'loading': */
-            setState(UINetworkManagerIndicatorState_Loading);
-        }
-    }
-
-    /* Update appearance finally: */
-    updateAppearance();
 }
 
@@ -242,2 +87,157 @@
 }
 
+void UINetworkManagerIndicator::sltAddNetworkManagerIndicatorDescription(UINetworkRequest *pNetworkRequest)
+{
+    /* Make sure network-request is really exists: */
+    AssertMsg(pNetworkRequest, ("Invalid network-request passed!"));
+    /* Make sure network-request was NOT registered yet: */
+    AssertMsg(!m_ids.contains(pNetworkRequest->uuid()), ("Network-request already registered!"));
+
+    /* Append network-request data: */
+    m_ids.append(pNetworkRequest->uuid());
+    m_data.append(UINetworkRequestData(pNetworkRequest->description(), 0, 0));
+
+    /* Prepare network-request listeners: */
+    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&)>(&UINetworkRequest::sigStarted),
+            this, &UINetworkManagerIndicator::sltSetProgressToStarted);
+    connect(pNetworkRequest, &UINetworkRequest::sigCanceled,
+            this, &UINetworkManagerIndicator::sltSetProgressToCanceled);
+    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&)>(&UINetworkRequest::sigFinished),
+            this, &UINetworkManagerIndicator::sltSetProgressToFinished);
+    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&, const QString &)>(&UINetworkRequest::sigFailed),
+            this, &UINetworkManagerIndicator::sltSetProgressToFailed);
+    connect(pNetworkRequest, static_cast<void(UINetworkRequest::*)(const QUuid&, qint64, qint64)>(&UINetworkRequest::sigProgress),
+            this, &UINetworkManagerIndicator::sltSetProgress);
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::sldRemoveNetworkManagerIndicatorDescription(const QUuid &uuid)
+{
+    /* Make sure network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("Network-request already unregistered!"));
+
+    /* Search for network-request index: */
+    int iIndexOfRequiredElement = m_ids.indexOf(uuid);
+
+    /* Delete corresponding network-request: */
+    m_ids.remove(iIndexOfRequiredElement);
+    m_data.remove(iIndexOfRequiredElement);
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::retranslateUi()
+{
+    /* Update appearance: */
+    updateAppearance();
+}
+
+void UINetworkManagerIndicator::sltSetProgressToStarted(const QUuid &uuid)
+{
+    /* Make sure that network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
+
+    /* Search for network-request index: */
+    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
+    /* Update corresponding network-request data: */
+    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
+    data.bytesReceived = 0;
+    data.bytesTotal = 0;
+    data.failed = false;
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::sltSetProgressToCanceled(const QUuid &uuid)
+{
+    /* Make sure that network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
+    Q_UNUSED(uuid);
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::sltSetProgressToFailed(const QUuid &uuid, const QString &)
+{
+    /* Make sure that network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
+
+    /* Search for network-request index: */
+    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
+    /* Update corresponding data: */
+    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
+    data.failed = true;
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::sltSetProgressToFinished(const QUuid &uuid)
+{
+    /* Make sure that network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
+    Q_UNUSED(uuid);
+
+    /* Update appearance: */
+    recalculateIndicatorState();
+}
+
+void UINetworkManagerIndicator::sltSetProgress(const QUuid &uuid, qint64 iReceived, qint64 iTotal)
+{
+    /* Make sure that network-request still registered: */
+    AssertMsg(m_ids.contains(uuid), ("That network-request already unregistered!"));
+
+    /* Search for network-request index: */
+    int iIndexOfNetworkRequest = m_ids.indexOf(uuid);
+    /* Update corresponding network-request data: */
+    UINetworkRequestData &data = m_data[iIndexOfNetworkRequest];
+    data.bytesReceived = iReceived;
+    data.bytesTotal = iTotal;
+
+    /* Update appearance: */
+    updateAppearance();
+}
+
+void UINetworkManagerIndicator::recalculateIndicatorState()
+{
+    /* Check if there are network-requests at all: */
+    if (m_ids.isEmpty())
+    {
+        /* Set state to 'idle': */
+        setState(UINetworkManagerIndicatorState_Idle);
+    }
+    else
+    {
+        /* Check if there is at least one failed network-request: */
+        bool fIsThereAtLeastOneFailedNetworkRequest = false;
+        for (int i = 0; i < m_data.size(); ++i)
+        {
+            if (m_data[i].failed)
+            {
+                fIsThereAtLeastOneFailedNetworkRequest = true;
+                break;
+            }
+        }
+
+        /* If there it least one failed network-request: */
+        if (fIsThereAtLeastOneFailedNetworkRequest)
+        {
+            /* Set state to 'error': */
+            setState(UINetworkManagerIndicatorState_Error);
+        }
+        else
+        {
+            /* Set state to 'loading': */
+            setState(UINetworkManagerIndicatorState_Loading);
+        }
+    }
+
+    /* Update appearance finally: */
+    updateAppearance();
+}
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,18 +16,20 @@
  */
 
-#ifndef __UINetworkManagerIndicator_h__
-#define __UINetworkManagerIndicator_h__
+#ifndef ___UINetworkManagerIndicator_h___
+#define ___UINetworkManagerIndicator_h___
 
-/* Global includes: */
+/* Qt includes: */
 #include <QVector>
 #include <QUuid>
 
-/* Local includes: */
+/* GUI includes: */
 #include "QIStatusBarIndicator.h"
+#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
 class UINetworkRequest;
 
-/* Network-manager status-bar indicator states: */
+
+/** Network-manager status-bar indicator states. */
 enum UINetworkManagerIndicatorState
 {
@@ -37,6 +39,7 @@
 };
 
-/* Network-manager status-bar indicator: */
-class UINetworkManagerIndicator : public QIStateStatusBarIndicator
+
+/** QIStateStatusBarIndicator extension for network-manager indicator. */
+class UINetworkManagerIndicator : public QIWithRetranslateUI<QIStateStatusBarIndicator>
 {
     Q_OBJECT;
@@ -44,8 +47,8 @@
 public:
 
-    /* Constructor: */
+    /** Constructs network manager indicator. */
     UINetworkManagerIndicator();
 
-    /** Update routine. */
+    /** Updates appearance. */
     void updateAppearance();
 
@@ -57,42 +60,53 @@
     void sldRemoveNetworkManagerIndicatorDescription(const QUuid &uuid);
 
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
 private slots:
 
-    /* Set particular network-request progress to 'started': */
+    /** Sets particular network-request @a uuid progress to 'started'. */
     void sltSetProgressToStarted(const QUuid &uuid);
-    /* Set particular network-request progress to 'canceled': */
+    /** Sets particular network-request @a uuid progress to 'canceled'. */
     void sltSetProgressToCanceled(const QUuid &uuid);
-    /* Set particular network-request progress to 'failed': */
+    /** Sets particular network-request @a uuid progress to 'failed'. */
     void sltSetProgressToFailed(const QUuid &uuid, const QString &strError);
-    /* Set particular network-request progress to 'finished': */
+    /** Sets particular network-request @a uuid progress to 'finished'. */
     void sltSetProgressToFinished(const QUuid &uuid);
-    /* Update particular network-request progress: */
+    /** Updates particular network-request @a uuid progress for @a iReceived amount of bytes among @a iTotal. */
     void sltSetProgress(const QUuid &uuid, qint64 iReceived, qint64 iTotal);
 
 private:
 
+    /** Network request data. */
     struct UINetworkRequestData
     {
+        /** Constructs network request data. */
         UINetworkRequestData()
             : bytesReceived(0), bytesTotal(0), failed(false) {}
+        /** Constructs network request data with @a strDescription, @a iBytesReceived and @a iBytesTotal. */
         UINetworkRequestData(const QString &strDescription, int iBytesReceived, int iBytesTotal)
             : description(strDescription), bytesReceived(iBytesReceived), bytesTotal(iBytesTotal), failed(false) {}
+        /** Holds the description. */
         QString description;
+        /** Holds the amount of bytes received. */
         int bytesReceived;
+        /** Holds the amount of total bytes. */
         int bytesTotal;
+        /** Holds whether request is failed. */
         bool failed;
     };
 
-    /* Translate stuff: */
-    void retranslateUi();
-
-    /* Update stuff: */
+    /** Update stuff. */
     void recalculateIndicatorState();
 
-    /* Variables: */
+    /** Holds the vector of network request IDs. */
     QVector<QUuid> m_ids;
+    /** Holds the vector of network request data. */
     QVector<UINetworkRequestData> m_data;
 };
 
-#endif // __UINetworkManagerIndicator_h__
 
+#endif /* !___UINetworkManagerIndicator_h___ */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2012-2017 Oracle Corporation
+ * Copyright (C) 2012-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -31,5 +31,5 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UINetworkRequest::UINetworkRequest(UINetworkRequestType type,
+UINetworkRequest::UINetworkRequest(UINetworkRequestType enmType,
                                    const QList<QUrl> &urls,
                                    const UserDictionary &requestHeaders,
@@ -37,5 +37,5 @@
                                    UINetworkManager *pNetworkManager)
     : QObject(pNetworkManager)
-    , m_type(type)
+    , m_enmType(enmType)
     , m_urls(urls)
     , m_requestHeaders(requestHeaders)
@@ -197,5 +197,5 @@
 {
     /* Create network-reply: */
-    m_pReply = new UINetworkReply(m_type, m_url, m_requestHeaders);
+    m_pReply = new UINetworkReply(m_enmType, m_url, m_requestHeaders);
     AssertPtrReturnVoid(m_pReply.data());
     {
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67,8 +67,8 @@
 public:
 
-    /** Constructs network-request of the passed @a type
+    /** Constructs network-request of the passed @a enmType
       * on the basis of the passed @a urls and the @a requestHeaders
       * for the @a pCustomer and @a pNetworkManager specified. */
-    UINetworkRequest(UINetworkRequestType type,
+    UINetworkRequest(UINetworkRequestType enmType,
                      const QList<QUrl> &urls,
                      const UserDictionary &requestHeaders,
@@ -118,5 +118,5 @@
 
     /** Holds the request type. */
-    const UINetworkRequestType m_type;
+    const UINetworkRequestType m_enmType;
     /** Holds the request urls. */
     const QList<QUrl> m_urls;
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20,18 +20,18 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes: */
-# include <QTimer>
-# include <QStyle>
+/* Qt includes: */
 # include <QGridLayout>
 # include <QProgressBar>
-
-/* Local includes: */
-# include "UINetworkRequestWidget.h"
-# include "UINetworkRequest.h"
+# include <QStyle>
+# include <QTimer>
+
+/* GUI includes: */
+# include "QIRichTextLabel.h"
+# include "QIToolButton.h"
+# include "UIIconPool.h"
 # include "UINetworkManager.h"
 # include "UINetworkManagerDialog.h"
-# include "UIIconPool.h"
-# include "QIToolButton.h"
-# include "QIRichTextLabel.h"
+# include "UINetworkRequest.h"
+# include "UINetworkRequestWidget.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -125,4 +125,23 @@
 }
 
+void UINetworkRequestWidget::retranslateUi()
+{
+    /* Get corresponding title: */
+    const QString &strTitle = m_pNetworkRequest->description();
+
+    /* Set popup title (default if missed): */
+    setTitle(strTitle.isEmpty() ? UINetworkManagerDialog::tr("Network Operation") : strTitle);
+
+    /* Translate retry button: */
+    m_pRetryButton->setStatusTip(UINetworkManagerDialog::tr("Restart network operation"));
+
+    /* Translate cancel button: */
+    m_pCancelButton->setStatusTip(UINetworkManagerDialog::tr("Cancel network operation"));
+
+    /* Translate error label: */
+    if (m_pNetworkRequest->reply())
+        m_pErrorPane->setText(composeErrorText(m_pNetworkRequest->reply()->errorString()));
+}
+
 void UINetworkRequestWidget::sltSetProgress(qint64 iReceived, qint64 iTotal)
 {
@@ -186,23 +205,4 @@
     /* Set current progress to unknown: */
     m_pProgressBar->setRange(0, 0);
-}
-
-void UINetworkRequestWidget::retranslateUi()
-{
-    /* Get corresponding title: */
-    const QString &strTitle = m_pNetworkRequest->description();
-
-    /* Set popup title (default if missed): */
-    setTitle(strTitle.isEmpty() ? UINetworkManagerDialog::tr("Network Operation") : strTitle);
-
-    /* Translate retry button: */
-    m_pRetryButton->setStatusTip(UINetworkManagerDialog::tr("Restart network operation"));
-
-    /* Translate cancel button: */
-    m_pCancelButton->setStatusTip(UINetworkManagerDialog::tr("Cancel network operation"));
-
-    /* Translate error label: */
-    if (m_pNetworkRequest->reply())
-        m_pErrorPane->setText(composeErrorText(m_pNetworkRequest->reply()->errorString()));
 }
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h	(revision 71463)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h	(revision 71466)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16,8 +16,8 @@
  */
 
-#ifndef __UINetworkRequestWidget_h__
-#define __UINetworkRequestWidget_h__
+#ifndef ___UINetworkRequestWidget_h___
+#define ___UINetworkRequestWidget_h___
 
-/* Local inludes: */
+/* GUI inludes: */
 #include "QIWithRetranslateUI.h"
 #include "UIPopupBox.h"
@@ -33,5 +33,5 @@
 class QTimer;
 
-/* UIPopupBox reimplementation to reflect network-request status: */
+/** UIPopupBox reimplementation to reflect network-request status. */
 class UINetworkRequestWidget : public QIWithRetranslateUI<UIPopupBox>
 {
@@ -40,52 +40,59 @@
 signals:
 
-    /* Signal to retry network-request: */
+    /** Asks to retry network-request. */
     void sigRetry();
-    /* Signal to cancel network-request: */
+    /** Asks to cancel network-request. */
     void sigCancel();
 
 protected:
 
-    /* Allow creation of UINetworkRequestWidget to UINetworkManagerDialog only: */
+    /** Allows creation of UINetworkRequestWidget to UINetworkManagerDialog only. */
     friend class UINetworkManagerDialog;
-    /* Constructor: */
+    /** Constructs @a pNetworkRequest widget passing @a pParent to the base-class. */
     UINetworkRequestWidget(UINetworkManagerDialog *pParent, UINetworkRequest *pNetworkRequest);
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
 
 private slots:
 
-    /* Updates current network-request progess: */
+    /** Updates current network-request progess as @a iReceived of @a iTotal. */
     void sltSetProgress(qint64 iReceived, qint64 iTotal);
 
-    /* Set current network-request progress to 'started': */
+    /** Sets current network-request progress to 'started'. */
     void sltSetProgressToStarted();
-    /* Set current network-request progress to 'finished': */
+    /** Sets current network-request progress to 'finished'. */
     void sltSetProgressToFinished();
-    /* Set current network-request progress to 'failed': */
+    /** Sets current network-request progress to 'failed' because of @a strError. */
     void sltSetProgressToFailed(const QString &strError);
 
-    /* Handle frozen progress: */
+    /** Handles frozen progress. */
     void sltTimeIsOut();
 
 private:
 
-    /* Translation stuff: */
-    void retranslateUi();
-
     /** Composes error text on the basis of the passed @a strErrorText. */
     static const QString composeErrorText(QString strErrorText);
 
-    /* Widgets: */
-    QWidget *m_pContentWidget;
-    QGridLayout *m_pMainLayout;
-    QProgressBar *m_pProgressBar;
-    QIToolButton *m_pRetryButton;
-    QIToolButton *m_pCancelButton;
+    /** Holds the contents widget instance. */
+    QWidget         *m_pContentWidget;
+    /** Holds the main layout instance. */
+    QGridLayout     *m_pMainLayout;
+    /** Holds the progress-bar instance. */
+    QProgressBar    *m_pProgressBar;
+    /** Holds the Retry button instance. */
+    QIToolButton    *m_pRetryButton;
+    /** Holds the Cancel button instance. */
+    QIToolButton    *m_pCancelButton;
+    /** Holds the error-pane instance. */
     QIRichTextLabel *m_pErrorPane;
 
-    /* Objects: */
+    /** Holds the network request reference. */
     UINetworkRequest *m_pNetworkRequest;
+
+    /** Holds the timeout timer instance. */
     QTimer *m_pTimer;
 };
 
-#endif // __UINetworkRequestWidget_h__
+#endif /* !___UINetworkRequestWidget_h___ */
 
