VirtualBox

Ignore:
Timestamp:
Jul 23, 2020 10:52:05 AM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9686, bugref:9510. Adding performance menu to manager ui

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

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r85406 r85426  
    22522252};
    22532253
     2254/** Menu action extension, used as 'Performance' menu class. */
     2255class UIActionMenuPerformanceMonitor : public UIActionMenu
     2256{
     2257    Q_OBJECT;
     2258
     2259public:
     2260
     2261    /** Constructs action passing @a pParent to the base-class. */
     2262    UIActionMenuPerformanceMonitor(UIActionPool *pParent)
     2263        : UIActionMenu(pParent)
     2264    {}
     2265
     2266protected:
     2267
     2268    /** Returns shortcut extra-data ID. */
     2269    virtual QString shortcutExtraDataID() const /* override */
     2270    {
     2271        return QString("PerformanceMonitorMenu");
     2272    }
     2273
     2274    /** Handles translation event. */
     2275    virtual void retranslateUi() /* override */
     2276    {
     2277        setName(QApplication::translate("UIActionPool", "Performance"));
     2278    }
     2279};
    22542280
    22552281/** Simple action extension, used as 'Export' action class. */
     
    25442570
    25452571    /* Create 'Performance Monitor' actions: */
     2572    m_pool[UIActionIndex_M_PerformanceMonitor] = new UIActionMenuPerformanceMonitor(this);
    25462573    m_pool[UIActionIndex_M_PerformanceMonitor_S_Export] = new UIActionMenuPerformanceMonitorExport(this);
    25472574
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

    r85406 r85426  
    137137
    138138    /* Machine performance monitor actions. */
     139    UIActionIndex_M_PerformanceMonitor,
    139140    UIActionIndex_M_PerformanceMonitor_S_Export,
    140141
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

    r85398 r85426  
    33663366    m_pool[UIActionIndexST_M_Group_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
    33673367    m_pool[UIActionIndexST_M_Group_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
    3368     m_pool[UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor] = new UIActionToggleSelectorToolsMachineShowPerformanceMonitor(this);
    33693368    m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
    33703369    m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
     
    34073406    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
    34083407    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
     3408    m_pool[UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor] = new UIActionToggleSelectorToolsMachineShowPerformanceMonitor(this);
    34093409    m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
    34103410    m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
     
    34793479    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
    34803480    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Logs));
    3481     m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor));
    34823481
    34833482    /* 'Machine' action groups: */
     
    34863485    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
    34873486    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Logs));
     3487    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor));
    34883488
    34893489    /* Prepare update-handlers for known menus: */
     
    35993599    updateMenuLogViewerWindow();
    36003600    updateMenuLogViewer();
     3601    /* 'Performance' Menu: */
     3602    addMenu(m_mainMenus, action(UIActionIndex_M_PerformanceMonitor));
     3603    updateMenuPerformanceMonitor();
    36013604
    36023605    /* 'Help' menu: */
     
    38693872    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
    38703873    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Logs));
    3871     pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor));
    38723874
    38733875    /* Mark menu as valid: */
     
    38873889    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
    38883890    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Logs));
     3891    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor));
    38893892
    38903893    /* Mark menu as valid: */
     
    41454148    pMenu->addAction(action(UIActionIndexST_M_Snapshot_T_Properties));
    41464149    pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Clone));
     4150
     4151    /* Mark menu as valid: */
     4152    m_invalidations.remove(UIActionIndexST_M_Snapshot);
     4153}
     4154
     4155void UIActionPoolManager::updateMenuPerformanceMonitor()
     4156{
     4157    /* Get corresponding menu: */
     4158    UIMenu *pMenu = action(UIActionIndex_M_PerformanceMonitor)->menu();
     4159    AssertPtrReturnVoid(pMenu);
     4160    /* Clear contents: */
     4161    pMenu->clear();
     4162
     4163    /* Populate Snapshot-menu: */
     4164    pMenu->addAction(action(UIActionIndex_M_PerformanceMonitor_S_Export));
    41474165
    41484166    /* Mark menu as valid: */
     
    42014219                    << action(UIActionIndexST_M_Group_M_Tools_T_Details)
    42024220                    << action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)
    4203                     << action(UIActionIndexST_M_Group_M_Tools_T_Logs)
    4204                     << action(UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor);
     4221                    << action(UIActionIndexST_M_Group_M_Tools_T_Logs);
    42054222            break;
    42064223        }
     
    42394256                    << action(UIActionIndexST_M_Machine_M_Tools_T_Details)
    42404257                    << action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)
    4241                     << action(UIActionIndexST_M_Machine_M_Tools_T_Logs);
     4258                    << action(UIActionIndexST_M_Machine_M_Tools_T_Logs)
     4259                    << action(UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor);
    42424260            break;
    42434261        }
  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

    r85396 r85426  
    8383    UIActionIndexST_M_Group_M_Tools_T_Snapshots,
    8484    UIActionIndexST_M_Group_M_Tools_T_Logs,
    85     UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor,
    8685    UIActionIndexST_M_Group_S_Discard,
    8786    UIActionIndexST_M_Group_S_ShowLogDialog,
     
    123122    UIActionIndexST_M_Machine_M_Tools_T_Snapshots,
    124123    UIActionIndexST_M_Machine_M_Tools_T_Logs,
     124    UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor,
    125125    UIActionIndexST_M_Machine_S_Discard,
    126126    UIActionIndexST_M_Machine_S_ShowLogDialog,
     
    283283    void updateMenuSnapshot();
    284284
     285    /** Updates 'Performance' menu. */
     286    void updateMenuPerformanceMonitor();
     287
     288
    285289    /** Updates shortcuts. */
    286290    virtual void updateShortcuts() /* override */;
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r85425 r85426  
    27882788    actionPool()->action(UIActionIndex_M_Log)->setVisible(fLogViewerMenuShown);
    27892789
     2790    const bool fPerformanceMenuShown = fMachineMenuShown &&
     2791        m_pWidget->currentMachineTool() == UIToolType_Performance;
     2792    actionPool()->action(UIActionIndex_M_PerformanceMonitor)->setVisible(fPerformanceMenuShown);
     2793
    27902794    /* Hide action shortcuts: */
    27912795    if (!fGlobalMenuShown)
     
    29732977                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Logs)->setChecked(true);
    29742978                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Logs)->setChecked(true);
     2979                break;
     2980            }
     2981            case UIToolType_Performance:
     2982            {
     2983                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor)->setChecked(true);
    29752984                break;
    29762985            }
  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

    r85406 r85426  
    831831                {
    832832                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_PerformanceMonitor_S_Export));
     833                    m_pToolBar->addSeparator();
     834                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
     835                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
     836                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
    833837                    break;
    834838                }
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