Changeset 44710 in vbox for trunk

Timestamp:

Feb 15, 2013 12:29:57 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83810

Message:

FE/Qt: 6065: Make sure shortcuts from all the action-pools were loaded into the shortcut-pool on any VBox GUI startup (selector UI and runtime UI).

Location:

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

Files:

• UIActionPool.cpp (modified) (1 diff)
• UIActionPool.h (modified) (1 diff)
• VBoxGlobal.cpp (modified) (1 diff)

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

@@ -553 +553 @@
     /* Delete instance: */
     delete m_pInstance;
+}
+
+/* static */
+void UIActionPool::createTemporary(UIActionPoolType type)
+{
+    UIActionPool *pHelperPool = 0;
+    switch (type)
+    {
+        case UIActionPoolType_Selector: pHelperPool = new UIActionPoolSelector; break;
+        case UIActionPoolType_Runtime: pHelperPool = new UIActionPoolRuntime; break;
+        default: break;
+    }
+    if (pHelperPool)
+    {
+        pHelperPool->prepare();
+        pHelperPool->cleanup();
+        delete pHelperPool;
+    }
 }
 

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

@@ -244 +244 @@
     static void destroy();
 
+    /* API: Shortcut pool helper stuff: */
+    static void createTemporary(UIActionPoolType type);
+
     /* API: RTTI: */
     UIActionPoolType type() const { return m_type; }

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

@@ -4589 +4589 @@
     /* Create action pool: */
     if (isVMConsoleProcess())
+    {
         UIActionPool::create(UIActionPoolType_Runtime);
+        UIActionPool::createTemporary(UIActionPoolType_Selector);
+    }
     else
+    {
         UIActionPool::create(UIActionPoolType_Selector);
+        UIActionPool::createTemporary(UIActionPoolType_Runtime);
+    }
 
     /* Create network manager: */