Changeset 85572 in vbox for trunk/src

Timestamp:

Jul 31, 2020 11:01:41 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510: A bit of cleanup for action-pool stuff changed in r139640.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPool.cpp (modified) (6 diffs)
• UIActionPool.h (modified) (3 diffs)
• UIActionPoolManager.cpp (modified) (1 diff)
• UIActionPoolManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -2270 +2270 @@
     virtual QString shortcutExtraDataID() const /* override */
     {
-        return QString("PerformanceMenu");
+        return QString("PerformanceMonitorMenu");
     }
 
@@ -2280 +2280 @@
 };
 
-/** Simple action extension, used as 'Export' action class. */
-class UIActionMenuSelectorPerformanceExport : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs action passing @a pParent to the base-class. */
-    UIActionMenuSelectorPerformanceExport(UIActionPool *pParent)
+/** Simple action extension, used as 'Perform Export' action class. */
+class UIActionMenuSelectorPerformancePerformExport : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuSelectorPerformancePerformExport(UIActionPool *pParent)
         : UIActionSimple(pParent,
                          ":/log_viewer_save_32px.png", ":/log_viewer_save_16px.png",
@@ -2526 +2526 @@
     m_pool[UIActionIndex_M_Log_S_Refresh] = new UIActionMenuSelectorLogPerformRefresh(this);
     m_pool[UIActionIndex_M_Log_S_Save] = new UIActionMenuSelectorLogPerformSave(this);
+
+    /* Create 'Performance Monitor' actions: */
+    m_pool[UIActionIndex_M_Performance] = new UIActionMenuSelectorPerformance(this);
+    m_pool[UIActionIndex_M_Performance_S_Export] = new UIActionMenuSelectorPerformancePerformExport(this);
 
     /* Create 'File Manager' actions: */
@@ -2564 +2568 @@
     m_pool[UIActionIndex_M_FileManager_S_Guest_ShowProperties] = new UIActionMenuFileManagerShowProperties(this);
 
-    /* Performance Monitor actions: */
-    m_pool[UIActionIndex_M_Performance] = new UIActionMenuSelectorPerformance(this);
-    m_pool[UIActionIndex_M_Performance_S_Export] = new UIActionMenuSelectorPerformanceExport(this);
-
     /* Prepare update-handlers for known menus: */
 #ifdef VBOX_WS_MAC
@@ -2576 +2576 @@
     m_menuUpdateHandlers[UIActionIndex_M_LogWindow].ptf = &UIActionPool::updateMenuLogViewerWindow;
     m_menuUpdateHandlers[UIActionIndex_M_Log].ptf = &UIActionPool::updateMenuLogViewer;
-
+    m_menuUpdateHandlers[UIActionIndex_M_Performance].ptf = &UIActionPool::updateMenuPerformanceMonitor;
     m_menuUpdateHandlers[UIActionIndex_M_FileManager].ptf = &UIActionPool::updateMenuFileManager;
 
@@ -2875 +2875 @@
 }
 
+void UIActionPool::updateMenuPerformanceMonitor()
+{
+    /* Get corresponding menu: */
+    UIMenu *pMenu = action(UIActionIndex_M_Performance)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* 'Export' action: */
+    pMenu->addAction(action(UIActionIndex_M_Performance_S_Export));
+
+    /* Mark menu as valid: */
+    m_invalidations.remove(UIActionIndex_M_Performance);
+}
+
 void UIActionPool::updateMenuFileManager()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -100 +100 @@
     UIActionIndex_M_Log_S_Refresh,
     UIActionIndex_M_Log_S_Save,
+
+    /* 'Performance' menu actions: */
+    UIActionIndex_M_Performance,
+    UIActionIndex_M_Performance_S_Export,
 
     /* File Manager actions: */
@@ -136 +140 @@
     UIActionIndex_M_FileManager_S_Guest_ShowProperties,
 
-    /* Performance Monitor actions: */
-    UIActionIndex_M_Performance,
-    UIActionIndex_M_Performance_S_Export,
-
     /* Maximum index: */
     UIActionIndex_Max
@@ -626 +626 @@
     /** Updates 'Log Viewer' @a pMenu. */
     virtual void updateMenuLogViewerWrapper(UIMenu *pMenu);
-
+    /** Updates 'Performance Monitor' menu. */
+    virtual void updateMenuPerformanceMonitor();
     /** Updates 'File Manager' menu. */
     virtual void updateMenuFileManager();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp

@@ -4201 +4201 @@
     /* Mark menu as valid: */
     m_invalidations.remove(UIActionIndexST_M_Snapshot);
-}
-
-void UIActionPoolManager::updateMenuPerformanceMonitor()
-{
-    /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndex_M_Performance)->menu();
-    AssertPtrReturnVoid(pMenu);
-    /* Clear contents: */
-    pMenu->clear();
-
-    /* Populate Performance-menu: */
-    pMenu->addAction(action(UIActionIndex_M_Performance_S_Export));
-
-    /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndex_M_Performance);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.h

@@ -287 +287 @@
     void updateMenuSnapshot();
 
-    /** Updates 'Performance' menu. */
-    void updateMenuPerformanceMonitor();
-
-
     /** Updates shortcuts. */
     virtual void updateShortcuts() /* override */;