VirtualBox

Ignore:
Timestamp:
Apr 30, 2024 12:06:43 PM (10 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
162976
Message:

FE/Qt. bugref:9510. Changing the way we add UIVMActivityMonitor to the runtime UI. this is not complete

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

    r104458 r104461  
    4242/* GUI includes: */
    4343#include "QIFileDialog.h"
     44#include "UIActionPool.h"
    4445#include "UICommon.h"
    4546#include "UIConverter.h"
    … …  
    10711072*********************************************************************************************************************************/
    10721073
    1073 UIVMActivityMonitor::UIVMActivityMonitor(EmbedTo enmEmbedding, QWidget *pParent, int iMaximumQueueSize)
     1074UIVMActivityMonitor::UIVMActivityMonitor(EmbedTo enmEmbedding, QWidget *pParent, UIActionPool *pActionPool, int iMaximumQueueSize)
    10741075    : QWidget(pParent)
    10751076    , m_pContainerLayout(0)
    … …  
    10791080    , m_pMainLayout(0)
    10801081    , m_enmEmbedding(enmEmbedding)
     1082    , m_pActionPool(pActionPool)
    10811083{
    10821084    uiCommon().setHelpKeyword(this, "vm-session-information");
    … …  
    12521254*********************************************************************************************************************************/
    12531255
    1254 UIVMActivityMonitorLocal::UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine)
    1255     :UIVMActivityMonitor(enmEmbedding, pParent, 120 /* iMaximumQueueSize */)
     1256UIVMActivityMonitorLocal::UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent,
     1257                                                   const CMachine &machine, UIActionPool *pActionPool)
     1258    :UIVMActivityMonitor(enmEmbedding, pParent, pActionPool, 120 /* iMaximumQueueSize */)
    12561259    , m_fGuestAdditionsAvailable(false)
    12571260{
    … …  
    18101813*********************************************************************************************************************************/
    18111814
    1812 UIVMActivityMonitorCloud::UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine)
    1813     :UIVMActivityMonitor(enmEmbedding, pParent, 60 /* iMaximumQueueSize */)
     1815UIVMActivityMonitorCloud::UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent,
     1816                                                   const CCloudMachine &machine, UIActionPool *pActionPool)
     1817    :UIVMActivityMonitor(enmEmbedding, pParent, pActionPool, 60 /* iMaximumQueueSize */)
    18141818    , m_pMachineStateUpdateTimer(0)
    18151819    , m_enmMachineState(KCloudMachineState_Invalid)

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

    r104449 r104461  
    5757class QVBoxLayout;
    5858class QLabel;
     59class UIActionPool;
    5960class UIChart;
    6061class UISession;
    … …  
    155156public:
    156157
    157     UIVMActivityMonitor(EmbedTo enmEmbedding, QWidget *pParent, int iMaximumQueueSize);
     158    UIVMActivityMonitor(EmbedTo enmEmbedding, QWidget *pParent, UIActionPool *pActionPool, int iMaximumQueueSize);
    158159    virtual QUuid machineId() const = 0;
    159160    virtual QString machineName() const = 0;
    … …  
    240241    QVBoxLayout *m_pMainLayout;
    241242    EmbedTo m_enmEmbedding;
     243    UIActionPool *m_pActionPool;
    242244};
    243245
    … …  
    251253    /** Constructs information-tab passing @a pParent to the QWidget base-class constructor.
    252254      * @param machine is machine reference. */
    253     UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine);
     255    UIVMActivityMonitorLocal(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine, UIActionPool *pActionPool);
    254256    ~UIVMActivityMonitorLocal();
    255257    virtual QUuid machineId() const RT_OVERRIDE;
    … …  
    319321public:
    320322
    321     UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine);
     323    UIVMActivityMonitorCloud(EmbedTo enmEmbedding, QWidget *pParent, const CCloudMachine &machine, UIActionPool *pActionPool);
    322324    virtual QUuid machineId() const RT_OVERRIDE;
    323325    virtual QString machineName() const RT_OVERRIDE;

  • trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitorContainer.cpp

    r104458 r104461  
    320320    if (!comMachine.isOk())
    321321        return;
    322     UIVMActivityMonitorLocal *pActivityMonitor = new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine);
     322    UIVMActivityMonitorLocal *pActivityMonitor = new UIVMActivityMonitorLocal(m_enmEmbedding, this, comMachine, m_pActionPool);
    323323    if (m_pPaneContainer)
    324324    {
    … …  
    334334    if (!comMachine.isOk())
    335335        return;
    336     UIVMActivityMonitorCloud *pActivityMonitor = new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine);
     336    UIVMActivityMonitorCloud *pActivityMonitor = new UIVMActivityMonitorCloud(m_enmEmbedding, this, comMachine, m_pActionPool);
    337337    if (m_pPaneContainer)
    338338    {

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r104393 r104461  
    16541654    if (!m_pVMInformationDialog)
    16551655    {
    1656         m_pVMInformationDialog = new UIVMInformationDialog;
     1656        m_pVMInformationDialog = new UIVMInformationDialog(actionPool());
    16571657        connect(m_pVMInformationDialog, &UIVMInformationDialog::sigClose,
    16581658                this, &UIMachineLogic::sltCloseInformationDialog);

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

    r104290 r104461  
    3434#include "QITabWidget.h"
    3535#include "QIDialogButtonBox.h"
     36#include "UIActionPool.h"
    3637#include "UICommon.h"
    3738#include "UIConverter.h"
    … …  
    4647#include "UIMachineView.h"
    4748#include "UIMessageCenter.h"
    48 #include "UIVMActivityMonitor.h"
     49#include "UIVMActivityMonitorContainer.h"
    4950#include "UISession.h"
    5051#include "UIShortcutPool.h"
    … …  
    5455#include "VBoxUtils.h"
    5556
    56 UIVMInformationDialog::UIVMInformationDialog()
     57UIVMInformationDialog::UIVMInformationDialog(UIActionPool *pActionPool)
    5758    : QMainWindowWithRestorableGeometry(0)
    5859    , m_pTabWidget(0)
    5960    , m_fCloseEmitted(false)
    6061    , m_iGeometrySaveTimerId(-1)
     62    , m_pActionPool(pActionPool)
    6163{
    6264    prepare();
    … …  
    224226        }
    225227
    226         /* Create Performance Monitor tab: */
    227         UIVMActivityMonitorLocal *pVMActivityMonitorWidget =
    228             new UIVMActivityMonitorLocal(EmbedTo_Dialog, this, gpMachine->uisession()->machine());
    229         if (pVMActivityMonitorWidget)
    230         {
    231             connect(gpMachine, &UIMachine::sigAdditionsStateChange,
    232                     pVMActivityMonitorWidget, &UIVMActivityMonitorLocal::sltGuestAdditionsStateChange);
    233             m_tabs.insert(Tabs_ActivityMonitor, pVMActivityMonitorWidget);
     228        /* Create Activity Monitor tab: */
     229        UIVMActivityMonitorContainer *pVMActivityMonitorContainer = new UIVMActivityMonitorContainer(this, m_pActionPool, EmbedTo_Dialog);
     230
     231        // UIVMActivityMonitorLocal *pVMActivityMonitorWidget =
     232        //     new UIVMActivityMonitorLocal(EmbedTo_Dialog, this, gpMachine->uisession()->machine());
     233        if (pVMActivityMonitorContainer)
     234        {
     235            pVMActivityMonitorContainer->addLocalMachine(gpMachine->uisession()->machine());
     236            m_tabs.insert(Tabs_ActivityMonitor, pVMActivityMonitorContainer);
    234237            m_pTabWidget->addTab(m_tabs.value(Tabs_ActivityMonitor), QString());
    235238        }

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

    r104290 r104461  
    4545class QITabWidget;
    4646class QIDialogButtonBox;
     47class UIActionPool;
    4748
    4849/* Type definitions: */
    … …  
    6263
    6364    /** Constructs information dialog. */
    64     UIVMInformationDialog();
     65    UIVMInformationDialog(UIActionPool *pActionPool);
    6566
    6667    /** Returns whether the dialog should be maximized when geometry being restored. */
    … …  
    116117    QUuid m_uMachineId;
    117118    QString m_strMachineName;
     119    UIActionPool *m_pActionPool;
    118120};
    119121
Note: See TracChangeset for help on using the changeset viewer.

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