Changeset 85426 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Jul 23, 2020 10:52:05 AM (4 years ago)
- 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 2252 2252 }; 2253 2253 2254 /** Menu action extension, used as 'Performance' menu class. */ 2255 class UIActionMenuPerformanceMonitor : public UIActionMenu 2256 { 2257 Q_OBJECT; 2258 2259 public: 2260 2261 /** Constructs action passing @a pParent to the base-class. */ 2262 UIActionMenuPerformanceMonitor(UIActionPool *pParent) 2263 : UIActionMenu(pParent) 2264 {} 2265 2266 protected: 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 }; 2254 2280 2255 2281 /** Simple action extension, used as 'Export' action class. */ … … 2544 2570 2545 2571 /* Create 'Performance Monitor' actions: */ 2572 m_pool[UIActionIndex_M_PerformanceMonitor] = new UIActionMenuPerformanceMonitor(this); 2546 2573 m_pool[UIActionIndex_M_PerformanceMonitor_S_Export] = new UIActionMenuPerformanceMonitorExport(this); 2547 2574 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
r85406 r85426 137 137 138 138 /* Machine performance monitor actions. */ 139 UIActionIndex_M_PerformanceMonitor, 139 140 UIActionIndex_M_PerformanceMonitor_S_Export, 140 141 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp
r85398 r85426 3366 3366 m_pool[UIActionIndexST_M_Group_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this); 3367 3367 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);3369 3368 m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this); 3370 3369 m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this); … … 3407 3406 m_pool[UIActionIndexST_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this); 3408 3407 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); 3409 3409 m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this); 3410 3410 m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this); … … 3479 3479 m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Snapshots)); 3480 3480 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));3482 3481 3483 3482 /* 'Machine' action groups: */ … … 3486 3485 m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)); 3487 3486 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)); 3488 3488 3489 3489 /* Prepare update-handlers for known menus: */ … … 3599 3599 updateMenuLogViewerWindow(); 3600 3600 updateMenuLogViewer(); 3601 /* 'Performance' Menu: */ 3602 addMenu(m_mainMenus, action(UIActionIndex_M_PerformanceMonitor)); 3603 updateMenuPerformanceMonitor(); 3601 3604 3602 3605 /* 'Help' menu: */ … … 3869 3872 pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)); 3870 3873 pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Logs)); 3871 pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor));3872 3874 3873 3875 /* Mark menu as valid: */ … … 3887 3889 pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)); 3888 3890 pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Logs)); 3891 pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor)); 3889 3892 3890 3893 /* Mark menu as valid: */ … … 4145 4148 pMenu->addAction(action(UIActionIndexST_M_Snapshot_T_Properties)); 4146 4149 pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Clone)); 4150 4151 /* Mark menu as valid: */ 4152 m_invalidations.remove(UIActionIndexST_M_Snapshot); 4153 } 4154 4155 void 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)); 4147 4165 4148 4166 /* Mark menu as valid: */ … … 4201 4219 << action(UIActionIndexST_M_Group_M_Tools_T_Details) 4202 4220 << 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); 4205 4222 break; 4206 4223 } … … 4239 4256 << action(UIActionIndexST_M_Machine_M_Tools_T_Details) 4240 4257 << 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); 4242 4260 break; 4243 4261 } -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h
r85396 r85426 83 83 UIActionIndexST_M_Group_M_Tools_T_Snapshots, 84 84 UIActionIndexST_M_Group_M_Tools_T_Logs, 85 UIActionIndexST_M_Group_M_Tools_T_PerformanceMonitor,86 85 UIActionIndexST_M_Group_S_Discard, 87 86 UIActionIndexST_M_Group_S_ShowLogDialog, … … 123 122 UIActionIndexST_M_Machine_M_Tools_T_Snapshots, 124 123 UIActionIndexST_M_Machine_M_Tools_T_Logs, 124 UIActionIndexST_M_Machine_M_Tools_T_PerformanceMonitor, 125 125 UIActionIndexST_M_Machine_S_Discard, 126 126 UIActionIndexST_M_Machine_S_ShowLogDialog, … … 283 283 void updateMenuSnapshot(); 284 284 285 /** Updates 'Performance' menu. */ 286 void updateMenuPerformanceMonitor(); 287 288 285 289 /** Updates shortcuts. */ 286 290 virtual void updateShortcuts() /* override */; -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
r85425 r85426 2788 2788 actionPool()->action(UIActionIndex_M_Log)->setVisible(fLogViewerMenuShown); 2789 2789 2790 const bool fPerformanceMenuShown = fMachineMenuShown && 2791 m_pWidget->currentMachineTool() == UIToolType_Performance; 2792 actionPool()->action(UIActionIndex_M_PerformanceMonitor)->setVisible(fPerformanceMenuShown); 2793 2790 2794 /* Hide action shortcuts: */ 2791 2795 if (!fGlobalMenuShown) … … 2973 2977 actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Logs)->setChecked(true); 2974 2978 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); 2975 2984 break; 2976 2985 } -
trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
r85406 r85426 831 831 { 832 832 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)); 833 837 break; 834 838 }
Note:
See TracChangeset
for help on using the changeset viewer.