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

Timestamp:

Sep 24, 2015 12:33:13 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Network Manager indicator which permanently added into selector-window should be managed/cleared by the selector-window as well (not by the Network Manager).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• net/UINetworkManager.cpp (modified) (4 diffs)
• net/UINetworkManager.h (modified) (3 diffs)
• net/UINetworkManagerIndicator.cpp (modified) (2 diffs)
• net/UINetworkManagerIndicator.h (modified) (1 diff)
• net/UINetworkRequest.cpp (modified) (4 diffs)
• net/UINetworkRequest.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -67 +67 @@
 }
 
-UINetworkManagerIndicator* UINetworkManager::indicator() const
-{
-    return m_pNetworkManagerIndicator;
+UINetworkManagerIndicator* UINetworkManager::createIndicator() const
+{
+    /* For Selector UI only: */
+    AssertReturn(!vboxGlobal().isVMConsoleProcess(), 0);
+
+    /* Create network-manager state-indicator: */
+    UINetworkManagerIndicator *pNetworkManagerIndicator = new UINetworkManagerIndicator;
+    connect(pNetworkManagerIndicator, SIGNAL(sigMouseDoubleClick(QIStatusBarIndicator*, QMouseEvent*)),
+            this, SLOT(show()));
+    connect(this, SIGNAL(sigAddNetworkManagerIndicatorDescription(UINetworkRequest*)),
+            pNetworkManagerIndicator, SLOT(sltAddNetworkManagerIndicatorDescription(UINetworkRequest*)));
+    connect(this, SIGNAL(sigRemoveNetworkManagerIndicatorDescription(const QUuid &)),
+            pNetworkManagerIndicator, SLOT(sldRemoveNetworkManagerIndicatorDescription(const QUuid &)));
+    return pNetworkManagerIndicator;
+}
+
+void UINetworkManager::registerNetworkRequest(UINetworkRequest *pNetworkRequest)
+{
+    /* Add network-request widget to network-manager dialog: */
+    m_pNetworkManagerDialog->addNetworkRequestWidget(pNetworkRequest);
+
+    /* Add network-request description to network-manager state-indicators: */
+    emit sigAddNetworkManagerIndicatorDescription(pNetworkRequest);
+}
+
+void UINetworkManager::unregisterNetworkRequest(const QUuid &uuid)
+{
+    /* Remove network-request description from network-manager state-indicator: */
+    emit sigRemoveNetworkManagerIndicatorDescription(uuid);
+
+    /* Remove network-request widget from network-manager dialog: */
+    m_pNetworkManagerDialog->removeNetworkRequestWidget(uuid);
 }
 
@@ -98 +127 @@
 UINetworkManager::UINetworkManager()
     : m_pNetworkManagerDialog(0)
-    , m_pNetworkManagerIndicator(0)
 {
     /* Prepare instance: */
@@ -115 +143 @@
     m_pNetworkManagerDialog = new UINetworkManagerDialog;
     connect(m_pNetworkManagerDialog, SIGNAL(sigCancelNetworkRequests()), this, SIGNAL(sigCancelNetworkRequests()));
-
-    /* Prepare network-manager state-indicator: */
-    if (!vboxGlobal().isVMConsoleProcess())
-    {
-        m_pNetworkManagerIndicator = new UINetworkManagerIndicator;
-        connect(m_pNetworkManagerIndicator, SIGNAL(sigMouseDoubleClick(QIStatusBarIndicator*, QMouseEvent*)), this, SLOT(show()));
-    }
 }
 
@@ -128 +149 @@
     /* Cleanup network-requests first: */
     cleanupNetworkRequests();
-
-    /* Cleanup network-manager state-indicator: */
-    if (!vboxGlobal().isVMConsoleProcess())
-    {
-        delete m_pNetworkManagerIndicator;
-        m_pNetworkManagerIndicator = 0;
-    }
 
     /* Cleanup network-manager dialog: */

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

@@ -46 +46 @@
     void sigCancelNetworkRequests();
 
+    /** Requests to add @a pNetworkRequest to network-manager state-indicators. */
+    void sigAddNetworkManagerIndicatorDescription(UINetworkRequest *pNetworkRequest);
+    /** Requests to remove network-request with @a uuid from network-manager state-indicators. */
+    void sigRemoveNetworkManagerIndicatorDescription(const QUuid &uuid);
+
 public:
 
@@ -58 +63 @@
     UINetworkManagerDialog* window() const;
 
-    /* Pointer to network-manager state-indicator: */
-    UINetworkManagerIndicator* indicator() const;
+    /** Creates network-manager state-indicator.
+      * @remarks To be cleaned up by the caller. */
+    UINetworkManagerIndicator* createIndicator() const;
+
+    /** Registers @a pNetworkRequest in network-manager. */
+    void registerNetworkRequest(UINetworkRequest *pNetworkRequest);
+    /** Unregisters network-request with @a uuid from network-manager. */
+    void unregisterNetworkRequest(const QUuid &uuid);
 
 public slots:
@@ -114 +125 @@
     /* Network-manager dialog: */
     UINetworkManagerDialog *m_pNetworkManagerDialog;
-    UINetworkManagerIndicator *m_pNetworkManagerIndicator;
 };
 #define gNetworkManager UINetworkManager::instance()

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

@@ -40 +40 @@
 }
 
-void UINetworkManagerIndicator::addNetworkRequest(UINetworkRequest *pNetworkRequest)
+void UINetworkManagerIndicator::sltAddNetworkManagerIndicatorDescription(UINetworkRequest *pNetworkRequest)
 {
     /* Make sure network-request is really exists: */
@@ -67 +67 @@
 }
 
-void UINetworkManagerIndicator::removeNetworkRequest(const QUuid &uuid)
+void UINetworkManagerIndicator::sldRemoveNetworkManagerIndicatorDescription(const QUuid &uuid)
 {
     /* Make sure network-request still registered: */

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

@@ -44 +44 @@
 public:
 
+    /* Constructor: */
+    UINetworkManagerIndicator();
+
     /** Update routine. */
     void updateAppearance();
 
-protected:
+private slots:
 
-    /* Allow creation of UINetworkManagerIndicator to UINetworkManager: */
-    friend class UINetworkManager;
-    /* Constructor: */
-    UINetworkManagerIndicator();
-
-    /* Allow adding/removing network-request tokens to UINetworkRequest: */
-    friend class UINetworkRequest;
-    /* Add network-request token: */
-    void addNetworkRequest(UINetworkRequest *pNetworkRequest);
-    /* Remove network-request token: */
-    void removeNetworkRequest(const QUuid &uuid);
-
-private slots:
+    /** Adds @a pNetworkRequest to network-manager state-indicators. */
+    void sltAddNetworkManagerIndicatorDescription(UINetworkRequest *pNetworkRequest);
+    /** Removes network-request with @a uuid from network-manager state-indicators. */
+    void sldRemoveNetworkManagerIndicatorDescription(const QUuid &uuid);
 
     /* Set particular network-request progress to 'started': */

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

@@ -40 +40 @@
                                    UINetworkManager *pNetworkManager)
     : QObject(pNetworkManager)
-    , m_pNetworkManagerDialog(pNetworkManager->window())
-    , m_pNetworkManagerIndicator(pNetworkManager->indicator())
     , m_uuid(QUuid::createUuid())
     , m_requests(QList<QNetworkRequest>() << request)
@@ -58 +56 @@
                                    UINetworkManager *pNetworkManager)
     : QObject(pNetworkManager)
-    , m_pNetworkManagerDialog(pNetworkManager->window())
-    , m_pNetworkManagerIndicator(pNetworkManager->indicator())
     , m_uuid(QUuid::createUuid())
     , m_requests(requests)
@@ -78 +74 @@
     cleanupNetworkReply();
 
-    /* Remove network-request description from network-manager state-indicator: */
-    if (m_pNetworkManagerIndicator)
-        m_pNetworkManagerIndicator->removeNetworkRequest(m_uuid);
-
-    /* Remove network-request widget from network-manager dialog: */
-    m_pNetworkManagerDialog->removeNetworkRequestWidget(m_uuid);
+    /* Unregister network-request from network-manager: */
+    manager()->unregisterNetworkRequest(m_uuid);
+}
+
+UINetworkManager* UINetworkRequest::manager() const
+{
+    AssertPtrReturn(parent(), 0);
+    return qobject_cast<UINetworkManager*>(parent());
 }
 
@@ -188 +186 @@
     connect(parent(), SIGNAL(sigCancelNetworkRequests()), this, SLOT(sltCancel()), Qt::QueuedConnection);
 
-    /* Create network-request widget in network-manager dialog: */
-    m_pNetworkManagerDialog->addNetworkRequestWidget(this);
-
-    /* Create network-request description in network-manager state-indicator: */
-    if (m_pNetworkManagerIndicator)
-        m_pNetworkManagerIndicator->addNetworkRequest(this);
+    /* Register network-request in network-manager: */
+    manager()->registerNetworkRequest(this);
 
     /* Choose first network-request as current: */

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

@@ -66 +66 @@
     ~UINetworkRequest();
 
+    /** Returns parent network-manager. */
+    UINetworkManager* manager() const;
     /* Getters: */
     const QUuid& uuid() const { return m_uuid; }
@@ -96 +98 @@
     void abortNetworkReply();
 
-    /* Widgets: */
-    UINetworkManagerDialog *m_pNetworkManagerDialog;
-    UINetworkManagerIndicator *m_pNetworkManagerIndicator;
-
     /* Variables: */
     QUuid m_uuid;

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1454 +1454 @@
 
     /* Add network-manager indicator: */
-    UINetworkManagerIndicator *pIndicator = gNetworkManager->indicator();
+    UINetworkManagerIndicator *pIndicator = gNetworkManager->createIndicator();
     statusBar()->addPermanentWidget(pIndicator);
     pIndicator->updateAppearance();