VirtualBox

Changeset 41457 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
May 28, 2012 10:22:45 AM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
78199
Message:

FE/Qt: Network manager stuff: Some cleanup.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r41153 r41457  
    3838#include "UIProgressDialog.h"
    3939#include "UINetworkManager.h"
     40#include "UINetworkManagerDialog.h"
    4041#ifdef VBOX_OSE
    4142# include "UIDownloaderUserManual.h"

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

    r41440 r41457  
    5656}
    5757
    58 QWidget* UINetworkManager::window() const
     58UINetworkManagerDialog* UINetworkManager::window() const
    5959{
    6060    return m_pNetworkManagerDialog;
    … …  
    7171{
    7272    /* Create network-request: */
    73     UINetworkRequest *pNetworkRequest = new UINetworkRequest(this, m_pNetworkManagerDialog, request, type, strDescription, pCustomer);
     73    UINetworkRequest *pNetworkRequest = new UINetworkRequest(request, type, strDescription, pCustomer, this);
    7474    /* Prepare created network-request: */
    7575    prepareNetworkRequest(pNetworkRequest);
    … …  
    8080{
    8181    /* Create network-request: */
    82     UINetworkRequest *pNetworkRequest = new UINetworkRequest(this, m_pNetworkManagerDialog, requests, type, strDescription, pCustomer);
     82    UINetworkRequest *pNetworkRequest = new UINetworkRequest(requests, type, strDescription, pCustomer, this);
    8383    /* Prepare created network-request: */
    8484    prepareNetworkRequest(pNetworkRequest);

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

    r41440 r41457  
    5656
    5757    /* Pointer to network-manager dialog: */
    58     QWidget* window() const;
     58    UINetworkManagerDialog* window() const;
    5959
    6060public slots:

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp

    r41440 r41457  
    9393}
    9494
    95 UINetworkRequestWidget* UINetworkManagerDialog::addNetworkRequestWidget(UINetworkRequest *pNetworkRequest)
     95void UINetworkManagerDialog::addNetworkRequestWidget(UINetworkRequest *pNetworkRequest)
    9696{
    9797    /* Make sure network-request is really exists: */
    … …  
    114114    }
    115115
    116     /* Return network-request widget: */
    117     return pNetworkRequestWidget;
     116    /* Prepare network-request widget's notifications for network-request: */
     117    connect(pNetworkRequestWidget, SIGNAL(sigRetry()), pNetworkRequest, SLOT(sltRetry()));
     118    connect(pNetworkRequestWidget, SIGNAL(sigCancel()), pNetworkRequest, SLOT(sltCancel()));
    118119}
    119120

  • trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h

    r41440 r41457  
    6060    friend class UINetworkRequest;
    6161    /* Add network-request widget: */
    62     UINetworkRequestWidget* addNetworkRequestWidget(UINetworkRequest *pNetworkRequest);
     62    void addNetworkRequestWidget(UINetworkRequest *pNetworkRequest);
    6363    /* Remove network-request widget: */
    6464    void removeNetworkRequestWidget(const QUuid &uuid);

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

    r41440 r41457  
    3030
    3131/* Constructor: */
    32 UINetworkRequest::UINetworkRequest(UINetworkManager *pNetworkManager,
    33                                    UINetworkManagerDialog *pNetworkManagerDialog,
    34                                    const QNetworkRequest &request, UINetworkRequestType type,
    35                                    const QString &strDescription, UINetworkCustomer *pCustomer)
     32UINetworkRequest::UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     33                                   UINetworkCustomer *pCustomer,
     34                                   UINetworkManager *pNetworkManager)
    3635    : QObject(pNetworkManager)
    37     , m_pNetworkManagerDialog(pNetworkManagerDialog)
    38     , m_pNetworkRequestWidget(0)
     36    , m_pNetworkManagerDialog(pNetworkManager->window())
    3937    , m_uuid(QUuid::createUuid())
    4038    , m_requests(QList<QNetworkRequest>() << request)
    … …  
    4947}
    5048
    51 UINetworkRequest::UINetworkRequest(UINetworkManager *pNetworkManager,
    52                                    UINetworkManagerDialog *pNetworkManagerDialog,
    53                                    const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    54                                    const QString &strDescription, UINetworkCustomer *pCustomer)
     49UINetworkRequest::UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     50                                   UINetworkCustomer *pCustomer,
     51                                   UINetworkManager *pNetworkManager)
    5552    : QObject(pNetworkManager)
    56     , m_pNetworkManagerDialog(pNetworkManagerDialog)
    57     , m_pNetworkRequestWidget(0)
     53    , m_pNetworkManagerDialog(pNetworkManager->window())
    5854    , m_uuid(QUuid::createUuid())
    5955    , m_requests(requests)
    … …  
    7470    cleanupNetworkReply();
    7571
    76     /* Destroy network-request widget: */
     72    /* Remove network-request widget from network-manager dialog: */
    7773    m_pNetworkManagerDialog->removeNetworkRequestWidget(m_uuid);
    7874}
    … …  
    8177void UINetworkRequest::sltHandleNetworkReplyProgress(qint64 iReceived, qint64 iTotal)
    8278{
    83     /* Notify network-manager: */
     79    /* Notify general network-requests listeners: */
    8480    emit sigProgress(m_uuid, iReceived, iTotal);
    85     /* Notify network-request widget: */
     81    /* Notify particular network-request listeners: */
    8682    emit sigProgress(iReceived, iTotal);
    8783}
    … …  
    120116        else
    121117        {
    122             /* Notify UINetworkRequestWidget: */
     118            /* Notify particular network-request listeners: */
    123119            emit sigFinished();
    124             /* Notify UINetworkManager: */
     120            /* Notify general network-requests listeners: */
    125121            emit sigFinished(m_uuid);
    126122        }
    … …  
    144140        else
    145141        {
    146             /* Notify UINetworkRequestWidget: */
     142            /* Notify particular network-request listeners: */
    147143            emit sigFailed(pNetworkReply->errorString());
    148             /* Notify UINetworkManager: */
     144            /* Notify general network-requests listeners: */
    149145            emit sigFailed(m_uuid, pNetworkReply->errorString());
    150146        }
    … …  
    179175    connect(parent(), SIGNAL(sigCancelNetworkRequests()), this, SLOT(sltCancel()));
    180176
    181     /* Create network-request widget: */
    182     m_pNetworkRequestWidget = m_pNetworkManagerDialog->addNetworkRequestWidget(this);
    183 
    184     /* Prepare listeners for m_pNetworkRequestWidget: */
    185     connect(m_pNetworkRequestWidget, SIGNAL(sigRetry()), this, SLOT(sltRetry()));
    186     connect(m_pNetworkRequestWidget, SIGNAL(sigCancel()), this, SLOT(sltCancel()));
     177    /* Create network-request widget in network-manager dialog: */
     178    m_pNetworkManagerDialog->addNetworkRequestWidget(this);
    187179
    188180    /* Choose first network-request as current: */
    … …  
    222214    m_fRunning = true;
    223215
    224     /* Notify UINetworkRequestWidget: */
     216    /* Notify general network-requests listeners: */
     217    emit sigStarted(m_uuid);
     218    /* Notify particular network-request listeners: */
    225219    emit sigStarted();
    226220}

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

    r41440 r41457  
    4444    /* Notifications to UINetworkManager: */
    4545    void sigProgress(const QUuid &uuid, qint64 iReceived, qint64 iTotal);
     46    void sigStarted(const QUuid &uuid);
    4647    void sigCanceled(const QUuid &uuid);
    4748    void sigFinished(const QUuid &uuid);
    … …  
    5758
    5859    /* Constructor/destructor: */
    59     UINetworkRequest(UINetworkManager *pNetworkManager,
    60                      UINetworkManagerDialog *pNetworkManagerDialog,
    61                      const QNetworkRequest &request, UINetworkRequestType type,
    62                      const QString &strDescription, UINetworkCustomer *pCustomer);
    63     UINetworkRequest(UINetworkManager *pNetworkManager,
    64                      UINetworkManagerDialog *pNetworkManagerDialog,
    65                      const QList<QNetworkRequest> &requests, UINetworkRequestType type,
    66                      const QString &strDescription, UINetworkCustomer *pCustomer);
     60    UINetworkRequest(const QNetworkRequest &request, UINetworkRequestType type, const QString &strDescription,
     61                     UINetworkCustomer *pCustomer,
     62                     UINetworkManager *pNetworkManager);
     63    UINetworkRequest(const QList<QNetworkRequest> &requests, UINetworkRequestType type, const QString &strDescription,
     64                     UINetworkCustomer *pCustomer,
     65                     UINetworkManager *pNetworkManager);
    6766    ~UINetworkRequest();
    6867
    … …  
    9998    /* Widgets: */
    10099    UINetworkManagerDialog *m_pNetworkManagerDialog;
    101     UINetworkRequestWidget *m_pNetworkRequestWidget;
    102100
    103101    /* Variables: */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette