Changeset 85597 in vbox for trunk/src/VBox

Timestamp:

Aug 3, 2020 12:17:47 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9609: A bit of cleanup for action-pool stuff: Rename ST (from SelecTor) to MN (MaNager).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/consolemanager/UICloudConsoleManager.cpp (modified) (9 diffs)
• cloud/profilemanager/UICloudProfileManager.cpp (modified) (9 diffs)
• globals/UIActionPoolManager.cpp (modified) (53 diffs)
• globals/UIActionPoolManager.h (modified) (2 diffs)
• globals/UIActionPoolRuntime.h (modified) (1 diff)
• hostnetwork/UIHostNetworkManager.cpp (modified) (7 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (46 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (6 diffs)
• manager/chooser/UIChooserModel.cpp (modified) (6 diffs)
• medium/UIMediumManager.cpp (modified) (10 diffs)
• monitor/resource/UIResourceMonitor.cpp (modified) (2 diffs)
• snapshots/UISnapshotPane.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.cpp

@@ -469 +469 @@
 QMenu *UICloudConsoleManagerWidget::menu() const
 {
-    return m_pActionPool->action(UIActionIndexST_M_CloudConsoleWindow)->menu();
+    return m_pActionPool->action(UIActionIndexMN_M_CloudConsoleWindow)->menu();
 }
 
@@ -689 +689 @@
 
     /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd)->setEnabled(!pItem || pItemApplication);
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove)->setEnabled(pItemApplication);
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd)->setEnabled(pItemApplication || pItemProfile);
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove)->setEnabled(pItemProfile);
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->setEnabled(pItemApplication || pItemProfile);
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd)->setEnabled(!pItem || pItemApplication);
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove)->setEnabled(pItemApplication);
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd)->setEnabled(pItemApplication || pItemProfile);
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove)->setEnabled(pItemProfile);
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details)->setEnabled(pItemApplication || pItemProfile);
 
     /* Update current-item definition: */
@@ -708 +708 @@
 
     /* Update details area visibility: */
-    sltToggleCloudConsoleDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->isChecked());
+    sltToggleCloudConsoleDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details)->isChecked());
 }
 
@@ -722 +722 @@
     if (pItemApplication)
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details));
     }
     else if (pItemProfile)
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details));
     }
     else
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd));
 
     /* And show it: */
@@ -787 +787 @@
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
-    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
-    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details));
 }
 
@@ -832 +832 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details));
 
 #ifdef VBOX_WS_MAC
@@ -894 +894 @@
 {
     /* Action connections: */
-    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd), &QAction::triggered,
             this, &UICloudConsoleManagerWidget::sltAddCloudConsoleApplication);
-    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove), &QAction::triggered,
             this, &UICloudConsoleManagerWidget::sltRemoveCloudConsoleApplication);
-    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileAdd), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd), &QAction::triggered,
             this, &UICloudConsoleManagerWidget::sltAddCloudConsoleProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_S_ProfileRemove), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove), &QAction::triggered,
             this, &UICloudConsoleManagerWidget::sltRemoveCloudConsoleProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details), &QAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details), &QAction::toggled,
             this, &UICloudConsoleManagerWidget::sltToggleCloudConsoleDetailsVisibility);
 
@@ -915 +915 @@
             this, &UICloudConsoleManagerWidget::sltHandleContextMenuRequest);
     connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-            m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details), &QAction::setChecked);
+            m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details), &QAction::setChecked);
     connect(m_pTreeWidget, &QITreeWidget::itemChanged,
             this, &UICloudConsoleManagerWidget::sltHandleItemChange);
@@ -937 +937 @@
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->setChecked(gEDataManager->cloudConsoleManagerDetailsExpanded());
-    sltToggleCloudConsoleDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_CloudConsole_T_Details)->isChecked());
+    m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details)->setChecked(gEDataManager->cloudConsoleManagerDetailsExpanded());
+    sltToggleCloudConsoleDetailsVisibility(m_pActionPool->action(UIActionIndexMN_M_CloudConsole_T_Details)->isChecked());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -164 +164 @@
 QMenu *UICloudProfileManagerWidget::menu() const
 {
-    return m_pActionPool->action(UIActionIndexST_M_CloudWindow)->menu();
+    return m_pActionPool->action(UIActionIndexMN_M_CloudWindow)->menu();
 }
 
@@ -521 +521 @@
 
     /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove)->setEnabled(pItemProfile);
-    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add)->setEnabled(!pItem || pItemProvider);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import)->setEnabled(!pItem || pItemProvider);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove)->setEnabled(pItemProfile);
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->setEnabled(pItemProfile || pItemProvider);
 
     /* If there is an item => update details data: */
@@ -534 +534 @@
 
     /* Update details area visibility: */
-    sltToggleCloudProfileDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->isChecked());
+    sltToggleCloudProfileDetailsVisibility(pItem && m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->isChecked());
 }
 
@@ -548 +548 @@
     if (pItemProfile)
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details));
     }
     else if (pItemProvider)
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details));
     }
 
@@ -611 +611 @@
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_TryPage));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Help));
 }
 
@@ -657 +657 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_TryPage));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Help));
 
 #ifdef VBOX_WS_MAC
@@ -720 +720 @@
 {
     /* Action connections: */
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Add), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Add), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltAddCloudProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Import), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Import), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltImportCloudProfiles);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Remove), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Remove), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltRemoveCloudProfile);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details), &QAction::toggled,
             this, &UICloudProfileManagerWidget::sltToggleCloudProfileDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_TryPage), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_TryPage), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltShowCloudProfileTryPage);
-    connect(m_pActionPool->action(UIActionIndexST_M_Cloud_S_Help), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Cloud_S_Help), &QAction::triggered,
             this, &UICloudProfileManagerWidget::sltShowCloudProfileHelp);
 
@@ -743 +743 @@
             this, &UICloudProfileManagerWidget::sltHandleContextMenuRequest);
     connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-            m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details), &QAction::setChecked);
+            m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details), &QAction::setChecked);
     connect(m_pTreeWidget, &QITreeWidget::itemChanged,
             this, &UICloudProfileManagerWidget::sltHandleItemChange);
@@ -763 +763 @@
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->setChecked(gEDataManager->cloudProfileManagerDetailsExpanded());
-    sltToggleCloudProfileDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_Cloud_T_Details)->isChecked());
+    m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->setChecked(gEDataManager->cloudProfileManagerDetailsExpanded());
+    sltToggleCloudProfileDetailsVisibility(m_pActionPool->action(UIActionIndexMN_M_Cloud_T_Details)->isChecked());
 }
 

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

@@ -3366 +3366 @@
 {
     /* 'File' actions: */
-    m_pool[UIActionIndexST_M_File] = new UIActionMenuSelectorFile(this);
-    m_pool[UIActionIndexST_M_File_S_ShowVirtualMediumManager] = new UIActionSimpleSelectorFileShowVirtualMediaManager(this);
-    m_pool[UIActionIndexST_M_File_S_ShowHostNetworkManager] = new UIActionSimpleSelectorFileShowHostNetworkManager(this);
-    m_pool[UIActionIndexST_M_File_S_ShowCloudProfileManager] = new UIActionSimpleSelectorFileShowCloudProfileManager(this);
-    m_pool[UIActionIndexST_M_File_S_ImportAppliance] = new UIActionSimpleSelectorFileShowImportApplianceWizard(this);
-    m_pool[UIActionIndexST_M_File_S_ExportAppliance] = new UIActionSimpleSelectorFileShowExportApplianceWizard(this);
-    m_pool[UIActionIndexST_M_File_S_NewCloudVM] = new UIActionSimpleSelectorFileShowNewCloudVMWizard(this);
+    m_pool[UIActionIndexMN_M_File] = new UIActionMenuSelectorFile(this);
+    m_pool[UIActionIndexMN_M_File_S_ShowVirtualMediumManager] = new UIActionSimpleSelectorFileShowVirtualMediaManager(this);
+    m_pool[UIActionIndexMN_M_File_S_ShowHostNetworkManager] = new UIActionSimpleSelectorFileShowHostNetworkManager(this);
+    m_pool[UIActionIndexMN_M_File_S_ShowCloudProfileManager] = new UIActionSimpleSelectorFileShowCloudProfileManager(this);
+    m_pool[UIActionIndexMN_M_File_S_ImportAppliance] = new UIActionSimpleSelectorFileShowImportApplianceWizard(this);
+    m_pool[UIActionIndexMN_M_File_S_ExportAppliance] = new UIActionSimpleSelectorFileShowExportApplianceWizard(this);
+    m_pool[UIActionIndexMN_M_File_S_NewCloudVM] = new UIActionSimpleSelectorFileShowNewCloudVMWizard(this);
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-    m_pool[UIActionIndexST_M_File_S_ShowExtraDataManager] = new UIActionSimpleSelectorFileShowExtraDataManager(this);
+    m_pool[UIActionIndexMN_M_File_S_ShowExtraDataManager] = new UIActionSimpleSelectorFileShowExtraDataManager(this);
 #endif
-    m_pool[UIActionIndexST_M_File_S_Close] = new UIActionSimpleSelectorFilePerformExit(this);
+    m_pool[UIActionIndexMN_M_File_S_Close] = new UIActionSimpleSelectorFilePerformExit(this);
 
     /* 'Welcome' actions: */
-    m_pool[UIActionIndexST_M_Welcome] = new UIActionMenuSelectorMachine(this);
-    m_pool[UIActionIndexST_M_Welcome_S_New] = new UIActionSimpleSelectorMachinePerformCreate(this);
-    m_pool[UIActionIndexST_M_Welcome_S_Add] = new UIActionSimpleSelectorMachinePerformAdd(this);
+    m_pool[UIActionIndexMN_M_Welcome] = new UIActionMenuSelectorMachine(this);
+    m_pool[UIActionIndexMN_M_Welcome_S_New] = new UIActionSimpleSelectorMachinePerformCreate(this);
+    m_pool[UIActionIndexMN_M_Welcome_S_Add] = new UIActionSimpleSelectorMachinePerformAdd(this);
 
     /* 'Group' actions: */
-    m_pool[UIActionIndexST_M_Group] = new UIActionMenuSelectorGroup(this);
-    m_pool[UIActionIndexST_M_Group_S_New] = new UIActionSimpleSelectorGroupPerformCreateMachine(this);
-    m_pool[UIActionIndexST_M_Group_S_Add] = new UIActionSimpleSelectorGroupPerformAddMachine(this);
-    m_pool[UIActionIndexST_M_Group_S_Rename] = new UIActionSimpleSelectorGroupPerformRename(this);
-    m_pool[UIActionIndexST_M_Group_S_Remove] = new UIActionSimpleSelectorGroupPerformRemove(this);
-    m_pool[UIActionIndexST_M_Group_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless] = new UIActionSimpleSelectorCommonPerformStartHeadless(this);
-    m_pool[UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable] = new UIActionSimpleSelectorCommonPerformStartDetachable(this);
-    m_pool[UIActionIndexST_M_Group_T_Pause] = new UIActionToggleSelectorCommonPauseAndResume(this);
-    m_pool[UIActionIndexST_M_Group_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this);
-    m_pool[UIActionIndexST_M_Group_M_Console] = new UIActionMenuSelectorConsole(this);
-    m_pool[UIActionIndexST_M_Group_M_Console_S_CreateConnection] = new UIActionSimpleSelectorConsolePerformCreateConnection(this);
-    m_pool[UIActionIndexST_M_Group_M_Console_S_DeleteConnection] = new UIActionSimpleSelectorConsolePerformDeleteConnection(this);
-    m_pool[UIActionIndexST_M_Group_M_Console_S_ConfigureApplications] = new UIActionSimpleSelectorConsolePerformConfigureApplications(this);
-    m_pool[UIActionIndexST_M_Group_M_Close] = new UIActionMenuSelectorClose(this);
-    m_pool[UIActionIndexST_M_Group_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this);
-    m_pool[UIActionIndexST_M_Group_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this);
-    m_pool[UIActionIndexST_M_Group_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this);
-    m_pool[UIActionIndexST_M_Group_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
-    m_pool[UIActionIndexST_M_Group_M_Tools_T_Performance] = new UIActionToggleSelectorToolsMachineShowPerformance(this);
-    m_pool[UIActionIndexST_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
-    m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
-    m_pool[UIActionIndexST_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
-    m_pool[UIActionIndexST_M_Group_S_Refresh] = new UIActionSimpleSelectorCommonPerformRefresh(this);
-    m_pool[UIActionIndexST_M_Group_S_ShowInFileManager] = new UIActionSimpleSelectorCommonShowInFileManager(this);
-    m_pool[UIActionIndexST_M_Group_S_CreateShortcut] = new UIActionSimpleSelectorCommonPerformCreateShortcut(this);
-    m_pool[UIActionIndexST_M_Group_S_Sort] = new UIActionSimpleSelectorGroupPerformSort(this);
+    m_pool[UIActionIndexMN_M_Group] = new UIActionMenuSelectorGroup(this);
+    m_pool[UIActionIndexMN_M_Group_S_New] = new UIActionSimpleSelectorGroupPerformCreateMachine(this);
+    m_pool[UIActionIndexMN_M_Group_S_Add] = new UIActionSimpleSelectorGroupPerformAddMachine(this);
+    m_pool[UIActionIndexMN_M_Group_S_Rename] = new UIActionSimpleSelectorGroupPerformRename(this);
+    m_pool[UIActionIndexMN_M_Group_S_Remove] = new UIActionSimpleSelectorGroupPerformRemove(this);
+    m_pool[UIActionIndexMN_M_Group_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
+    m_pool[UIActionIndexMN_M_Group_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
+    m_pool[UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
+    m_pool[UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless] = new UIActionSimpleSelectorCommonPerformStartHeadless(this);
+    m_pool[UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable] = new UIActionSimpleSelectorCommonPerformStartDetachable(this);
+    m_pool[UIActionIndexMN_M_Group_T_Pause] = new UIActionToggleSelectorCommonPauseAndResume(this);
+    m_pool[UIActionIndexMN_M_Group_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this);
+    m_pool[UIActionIndexMN_M_Group_M_Console] = new UIActionMenuSelectorConsole(this);
+    m_pool[UIActionIndexMN_M_Group_M_Console_S_CreateConnection] = new UIActionSimpleSelectorConsolePerformCreateConnection(this);
+    m_pool[UIActionIndexMN_M_Group_M_Console_S_DeleteConnection] = new UIActionSimpleSelectorConsolePerformDeleteConnection(this);
+    m_pool[UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications] = new UIActionSimpleSelectorConsolePerformConfigureApplications(this);
+    m_pool[UIActionIndexMN_M_Group_M_Close] = new UIActionMenuSelectorClose(this);
+    m_pool[UIActionIndexMN_M_Group_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this);
+    m_pool[UIActionIndexMN_M_Group_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this);
+    m_pool[UIActionIndexMN_M_Group_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this);
+    m_pool[UIActionIndexMN_M_Group_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
+    m_pool[UIActionIndexMN_M_Group_M_Tools_T_Performance] = new UIActionToggleSelectorToolsMachineShowPerformance(this);
+    m_pool[UIActionIndexMN_M_Group_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
+    m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
+    m_pool[UIActionIndexMN_M_Group_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
+    m_pool[UIActionIndexMN_M_Group_S_Refresh] = new UIActionSimpleSelectorCommonPerformRefresh(this);
+    m_pool[UIActionIndexMN_M_Group_S_ShowInFileManager] = new UIActionSimpleSelectorCommonShowInFileManager(this);
+    m_pool[UIActionIndexMN_M_Group_S_CreateShortcut] = new UIActionSimpleSelectorCommonPerformCreateShortcut(this);
+    m_pool[UIActionIndexMN_M_Group_S_Sort] = new UIActionSimpleSelectorGroupPerformSort(this);
 
     /* 'Machine' actions: */
-    m_pool[UIActionIndexST_M_Machine] = new UIActionMenuSelectorMachine(this);
-    m_pool[UIActionIndexST_M_Machine_S_New] = new UIActionSimpleSelectorMachinePerformCreate(this);
-    m_pool[UIActionIndexST_M_Machine_S_Add] = new UIActionSimpleSelectorMachinePerformAdd(this);
-    m_pool[UIActionIndexST_M_Machine_S_Settings] = new UIActionSimpleSelectorMachineShowSettings(this);
-    m_pool[UIActionIndexST_M_Machine_S_Clone] = new UIActionSimpleSelectorMachinePerformClone(this);
-    m_pool[UIActionIndexST_M_Machine_S_Move] = new UIActionSimpleSelectorMachinePerformMove(this);
-    m_pool[UIActionIndexST_M_Machine_S_ExportToOCI] = new UIActionSimpleSelectorMachinePerformExportToOCI(this);
-    m_pool[UIActionIndexST_M_Machine_S_Remove] = new UIActionSimpleSelectorMachinePerformRemove(this);
-    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
-    m_pool[UIActionIndexST_M_Machine_M_MoveToGroup_S_New] = new UIActionSimpleSelectorMachineMoveToGroupNew(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless] = new UIActionSimpleSelectorCommonPerformStartHeadless(this);
-    m_pool[UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable] = new UIActionSimpleSelectorCommonPerformStartDetachable(this);
-    m_pool[UIActionIndexST_M_Machine_T_Pause] = new UIActionToggleSelectorCommonPauseAndResume(this);
-    m_pool[UIActionIndexST_M_Machine_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this);
-    m_pool[UIActionIndexST_M_Machine_M_Console] = new UIActionMenuSelectorConsole(this);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_CreateConnection] = new UIActionSimpleSelectorConsolePerformCreateConnection(this);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_DeleteConnection] = new UIActionSimpleSelectorConsolePerformDeleteConnection(this);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, true, true);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, true, false);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, false, true);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, false, false);
-    m_pool[UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications] = new UIActionSimpleSelectorConsolePerformConfigureApplications(this);
-    m_pool[UIActionIndexST_M_Machine_M_Close] = new UIActionMenuSelectorClose(this);
-    m_pool[UIActionIndexST_M_Machine_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this);
-    m_pool[UIActionIndexST_M_Machine_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this);
-    m_pool[UIActionIndexST_M_Machine_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this);
-    m_pool[UIActionIndexST_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
-    m_pool[UIActionIndexST_M_Machine_M_Tools_T_Performance] = new UIActionToggleSelectorToolsMachineShowPerformance(this);
-    m_pool[UIActionIndexST_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
-    m_pool[UIActionIndexST_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
-    m_pool[UIActionIndexST_M_Machine_S_Refresh] = new UIActionSimpleSelectorCommonPerformRefresh(this);
-    m_pool[UIActionIndexST_M_Machine_S_ShowInFileManager] = new UIActionSimpleSelectorCommonShowInFileManager(this);
-    m_pool[UIActionIndexST_M_Machine_S_CreateShortcut] = new UIActionSimpleSelectorCommonPerformCreateShortcut(this);
-    m_pool[UIActionIndexST_M_Machine_S_SortParent] = new UIActionSimpleSelectorMachinePerformSortParent(this);
-    m_pool[UIActionIndexST_M_Machine_T_Search] = new UIActionToggleSelectorMachineToggleSearch(this);
+    m_pool[UIActionIndexMN_M_Machine] = new UIActionMenuSelectorMachine(this);
+    m_pool[UIActionIndexMN_M_Machine_S_New] = new UIActionSimpleSelectorMachinePerformCreate(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Add] = new UIActionSimpleSelectorMachinePerformAdd(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Settings] = new UIActionSimpleSelectorMachineShowSettings(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Clone] = new UIActionSimpleSelectorMachinePerformClone(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Move] = new UIActionSimpleSelectorMachinePerformMove(this);
+    m_pool[UIActionIndexMN_M_Machine_S_ExportToOCI] = new UIActionSimpleSelectorMachinePerformExportToOCI(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Remove] = new UIActionSimpleSelectorMachinePerformRemove(this);
+    m_pool[UIActionIndexMN_M_Machine_M_MoveToGroup] = new UIActionMenuSelectorCommonMoveToGroup(this);
+    m_pool[UIActionIndexMN_M_Machine_M_MoveToGroup_S_New] = new UIActionSimpleSelectorMachineMoveToGroupNew(this);
+    m_pool[UIActionIndexMN_M_Machine_M_StartOrShow] = new UIActionStateSelectorCommonStartOrShow(this);
+    m_pool[UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal] = new UIActionSimpleSelectorCommonPerformStartNormal(this);
+    m_pool[UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless] = new UIActionSimpleSelectorCommonPerformStartHeadless(this);
+    m_pool[UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable] = new UIActionSimpleSelectorCommonPerformStartDetachable(this);
+    m_pool[UIActionIndexMN_M_Machine_T_Pause] = new UIActionToggleSelectorCommonPauseAndResume(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Reset] = new UIActionSimpleSelectorCommonPerformReset(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Console] = new UIActionMenuSelectorConsole(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_CreateConnection] = new UIActionSimpleSelectorConsolePerformCreateConnection(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection] = new UIActionSimpleSelectorConsolePerformDeleteConnection(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, true, true);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, true, false);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, false, true);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows] = new UIActionSimpleSelectorConsolePerformCopyCommand(this, false, false);
+    m_pool[UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications] = new UIActionSimpleSelectorConsolePerformConfigureApplications(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Close] = new UIActionMenuSelectorClose(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Close_S_Detach] = new UIActionSimpleSelectorClosePerformDetach(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Close_S_SaveState] = new UIActionSimpleSelectorClosePerformSave(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Close_S_Shutdown] = new UIActionSimpleSelectorClosePerformShutdown(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Close_S_PowerOff] = new UIActionSimpleSelectorClosePerformPowerOff(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools] = new UIActionMenuSelectorToolsMachine(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Details] = new UIActionToggleSelectorToolsMachineShowDetails(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Snapshots] = new UIActionToggleSelectorToolsMachineShowSnapshots(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Logs] = new UIActionToggleSelectorToolsMachineShowLogs(this);
+    m_pool[UIActionIndexMN_M_Machine_M_Tools_T_Performance] = new UIActionToggleSelectorToolsMachineShowPerformance(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Discard] = new UIActionSimpleSelectorCommonPerformDiscard(this);
+    m_pool[UIActionIndexMN_M_Machine_S_ShowLogDialog] = new UIActionSimpleSelectorCommonShowMachineLogs(this);
+    m_pool[UIActionIndexMN_M_Machine_S_Refresh] = new UIActionSimpleSelectorCommonPerformRefresh(this);
+    m_pool[UIActionIndexMN_M_Machine_S_ShowInFileManager] = new UIActionSimpleSelectorCommonShowInFileManager(this);
+    m_pool[UIActionIndexMN_M_Machine_S_CreateShortcut] = new UIActionSimpleSelectorCommonPerformCreateShortcut(this);
+    m_pool[UIActionIndexMN_M_Machine_S_SortParent] = new UIActionSimpleSelectorMachinePerformSortParent(this);
+    m_pool[UIActionIndexMN_M_Machine_T_Search] = new UIActionToggleSelectorMachineToggleSearch(this);
 
     /* Global Tools actions: */
-    m_pool[UIActionIndexST_M_Tools_M_Global] = new UIActionMenuSelectorToolsGlobal(this);
-    m_pool[UIActionIndexST_M_Tools_M_Global_S_VirtualMediaManager] = new UIActionSimpleSelectorToolsGlobalShowVirtualMediaManager(this);
-    m_pool[UIActionIndexST_M_Tools_M_Global_S_HostNetworkManager] = new UIActionSimpleSelectorToolsGlobalShowHostNetworkManager(this);
-    m_pool[UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager] = new UIActionSimpleSelectorToolsGlobalShowCloudProfileManager(this);
-    m_pool[UIActionIndexST_M_Tools_M_Global_S_VMResourceMonitor] = new UIActionSimpleSelectorToolsGlobalShowVMResourceMonitor(this);
+    m_pool[UIActionIndexMN_M_Tools_M_Global] = new UIActionMenuSelectorToolsGlobal(this);
+    m_pool[UIActionIndexMN_M_Tools_M_Global_S_VirtualMediaManager] = new UIActionSimpleSelectorToolsGlobalShowVirtualMediaManager(this);
+    m_pool[UIActionIndexMN_M_Tools_M_Global_S_HostNetworkManager] = new UIActionSimpleSelectorToolsGlobalShowHostNetworkManager(this);
+    m_pool[UIActionIndexMN_M_Tools_M_Global_S_CloudProfileManager] = new UIActionSimpleSelectorToolsGlobalShowCloudProfileManager(this);
+    m_pool[UIActionIndexMN_M_Tools_M_Global_S_VMResourceMonitor] = new UIActionSimpleSelectorToolsGlobalShowVMResourceMonitor(this);
 
     /* Snapshot Pane actions: */
-    m_pool[UIActionIndexST_M_Snapshot] = new UIActionMenuSelectorSnapshot(this);
-    m_pool[UIActionIndexST_M_Snapshot_S_Take] = new UIActionMenuSelectorSnapshotPerformTake(this);
-    m_pool[UIActionIndexST_M_Snapshot_S_Delete] = new UIActionMenuSelectorSnapshotPerformDelete(this);
-    m_pool[UIActionIndexST_M_Snapshot_S_Restore] = new UIActionMenuSelectorSnapshotPerformRestore(this);
-    m_pool[UIActionIndexST_M_Snapshot_T_Properties] = new UIActionMenuSelectorSnapshotToggleProperties(this);
-    m_pool[UIActionIndexST_M_Snapshot_S_Clone] = new UIActionMenuSelectorSnapshotPerformClone(this);
+    m_pool[UIActionIndexMN_M_Snapshot] = new UIActionMenuSelectorSnapshot(this);
+    m_pool[UIActionIndexMN_M_Snapshot_S_Take] = new UIActionMenuSelectorSnapshotPerformTake(this);
+    m_pool[UIActionIndexMN_M_Snapshot_S_Delete] = new UIActionMenuSelectorSnapshotPerformDelete(this);
+    m_pool[UIActionIndexMN_M_Snapshot_S_Restore] = new UIActionMenuSelectorSnapshotPerformRestore(this);
+    m_pool[UIActionIndexMN_M_Snapshot_T_Properties] = new UIActionMenuSelectorSnapshotToggleProperties(this);
+    m_pool[UIActionIndexMN_M_Snapshot_S_Clone] = new UIActionMenuSelectorSnapshotPerformClone(this);
 
     /* Virtual Medium Manager actions: */
-    m_pool[UIActionIndexST_M_MediumWindow] = new UIActionMenuSelectorMedium(this);
-    m_pool[UIActionIndexST_M_Medium] = new UIActionMenuSelectorMedium(this);
-    m_pool[UIActionIndexST_M_Medium_S_Add] = new UIActionMenuSelectorMediumPerformAdd(this);
-    m_pool[UIActionIndexST_M_Medium_S_Create] = new UIActionMenuSelectorMediumPerformCreate(this);
-    m_pool[UIActionIndexST_M_Medium_S_Copy] = new UIActionMenuSelectorMediumPerformCopy(this);
-    m_pool[UIActionIndexST_M_Medium_S_Move] = new UIActionMenuSelectorMediumPerformMove(this);
-    m_pool[UIActionIndexST_M_Medium_S_Remove] = new UIActionMenuSelectorMediumPerformRemove(this);
-    m_pool[UIActionIndexST_M_Medium_S_Release] = new UIActionMenuSelectorMediumPerformRelease(this);
-    m_pool[UIActionIndexST_M_Medium_T_Details] = new UIActionMenuSelectorMediumToggleProperties(this);
-    m_pool[UIActionIndexST_M_Medium_T_Search] = new UIActionMenuSelectorMediumToggleSearch(this);
-    m_pool[UIActionIndexST_M_Medium_S_Refresh] = new UIActionMenuSelectorMediumPerformRefresh(this);
+    m_pool[UIActionIndexMN_M_MediumWindow] = new UIActionMenuSelectorMedium(this);
+    m_pool[UIActionIndexMN_M_Medium] = new UIActionMenuSelectorMedium(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Add] = new UIActionMenuSelectorMediumPerformAdd(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Create] = new UIActionMenuSelectorMediumPerformCreate(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Copy] = new UIActionMenuSelectorMediumPerformCopy(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Move] = new UIActionMenuSelectorMediumPerformMove(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Remove] = new UIActionMenuSelectorMediumPerformRemove(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Release] = new UIActionMenuSelectorMediumPerformRelease(this);
+    m_pool[UIActionIndexMN_M_Medium_T_Details] = new UIActionMenuSelectorMediumToggleProperties(this);
+    m_pool[UIActionIndexMN_M_Medium_T_Search] = new UIActionMenuSelectorMediumToggleSearch(this);
+    m_pool[UIActionIndexMN_M_Medium_S_Refresh] = new UIActionMenuSelectorMediumPerformRefresh(this);
 
     /* Host Network Manager actions: */
-    m_pool[UIActionIndexST_M_NetworkWindow] = new UIActionMenuSelectorNetwork(this);
-    m_pool[UIActionIndexST_M_Network] = new UIActionMenuSelectorNetwork(this);
-    m_pool[UIActionIndexST_M_Network_S_Create] = new UIActionMenuSelectorNetworkPerformCreate(this);
-    m_pool[UIActionIndexST_M_Network_S_Remove] = new UIActionMenuSelectorNetworkPerformRemove(this);
-    m_pool[UIActionIndexST_M_Network_T_Details] = new UIActionMenuSelectorNetworkToggleProperties(this);
-    m_pool[UIActionIndexST_M_Network_S_Refresh] = new UIActionMenuSelectorNetworkPerformRefresh(this);
+    m_pool[UIActionIndexMN_M_NetworkWindow] = new UIActionMenuSelectorNetwork(this);
+    m_pool[UIActionIndexMN_M_Network] = new UIActionMenuSelectorNetwork(this);
+    m_pool[UIActionIndexMN_M_Network_S_Create] = new UIActionMenuSelectorNetworkPerformCreate(this);
+    m_pool[UIActionIndexMN_M_Network_S_Remove] = new UIActionMenuSelectorNetworkPerformRemove(this);
+    m_pool[UIActionIndexMN_M_Network_T_Details] = new UIActionMenuSelectorNetworkToggleProperties(this);
+    m_pool[UIActionIndexMN_M_Network_S_Refresh] = new UIActionMenuSelectorNetworkPerformRefresh(this);
 
     /* Cloud Profile Manager actions: */
-    m_pool[UIActionIndexST_M_CloudWindow] = new UIActionMenuSelectorCloud(this);
-    m_pool[UIActionIndexST_M_Cloud] = new UIActionMenuSelectorCloud(this);
-    m_pool[UIActionIndexST_M_Cloud_S_Add] = new UIActionMenuSelectorCloudPerformAdd(this);
-    m_pool[UIActionIndexST_M_Cloud_S_Import] = new UIActionMenuSelectorCloudPerformImport(this);
-    m_pool[UIActionIndexST_M_Cloud_S_Remove] = new UIActionMenuSelectorCloudPerformRemove(this);
-    m_pool[UIActionIndexST_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this);
-    m_pool[UIActionIndexST_M_Cloud_S_TryPage] = new UIActionMenuSelectorCloudShowTryPage(this);
-    m_pool[UIActionIndexST_M_Cloud_S_Help] = new UIActionMenuSelectorCloudShowHelp(this);
+    m_pool[UIActionIndexMN_M_CloudWindow] = new UIActionMenuSelectorCloud(this);
+    m_pool[UIActionIndexMN_M_Cloud] = new UIActionMenuSelectorCloud(this);
+    m_pool[UIActionIndexMN_M_Cloud_S_Add] = new UIActionMenuSelectorCloudPerformAdd(this);
+    m_pool[UIActionIndexMN_M_Cloud_S_Import] = new UIActionMenuSelectorCloudPerformImport(this);
+    m_pool[UIActionIndexMN_M_Cloud_S_Remove] = new UIActionMenuSelectorCloudPerformRemove(this);
+    m_pool[UIActionIndexMN_M_Cloud_T_Details] = new UIActionMenuSelectorCloudToggleProperties(this);
+    m_pool[UIActionIndexMN_M_Cloud_S_TryPage] = new UIActionMenuSelectorCloudShowTryPage(this);
+    m_pool[UIActionIndexMN_M_Cloud_S_Help] = new UIActionMenuSelectorCloudShowHelp(this);
 
     /* Cloud Console Manager actions: */
-    m_pool[UIActionIndexST_M_CloudConsoleWindow] = new UIActionMenuSelectorCloudConsole(this);
-    m_pool[UIActionIndexST_M_CloudConsole] = new UIActionMenuSelectorCloudConsole(this);
-    m_pool[UIActionIndexST_M_CloudConsole_S_ApplicationAdd] = new UIActionMenuSelectorCloudConsolePerformApplicationAdd(this);
-    m_pool[UIActionIndexST_M_CloudConsole_S_ApplicationRemove] = new UIActionMenuSelectorCloudConsolePerformApplicationRemove(this);
-    m_pool[UIActionIndexST_M_CloudConsole_S_ProfileAdd] = new UIActionMenuSelectorCloudConsolePerformProfileAdd(this);
-    m_pool[UIActionIndexST_M_CloudConsole_S_ProfileRemove] = new UIActionMenuSelectorCloudConsolePerformProfileRemove(this);
-    m_pool[UIActionIndexST_M_CloudConsole_T_Details] = new UIActionMenuSelectorCloudConsoleToggleProperties(this);
+    m_pool[UIActionIndexMN_M_CloudConsoleWindow] = new UIActionMenuSelectorCloudConsole(this);
+    m_pool[UIActionIndexMN_M_CloudConsole] = new UIActionMenuSelectorCloudConsole(this);
+    m_pool[UIActionIndexMN_M_CloudConsole_S_ApplicationAdd] = new UIActionMenuSelectorCloudConsolePerformApplicationAdd(this);
+    m_pool[UIActionIndexMN_M_CloudConsole_S_ApplicationRemove] = new UIActionMenuSelectorCloudConsolePerformApplicationRemove(this);
+    m_pool[UIActionIndexMN_M_CloudConsole_S_ProfileAdd] = new UIActionMenuSelectorCloudConsolePerformProfileAdd(this);
+    m_pool[UIActionIndexMN_M_CloudConsole_S_ProfileRemove] = new UIActionMenuSelectorCloudConsolePerformProfileRemove(this);
+    m_pool[UIActionIndexMN_M_CloudConsole_T_Details] = new UIActionMenuSelectorCloudConsoleToggleProperties(this);
 
     /* VM resource Monitor actions: */
-    m_pool[UIActionIndexST_M_VMResourceMonitor] = new UIActionMenuVMResourceMonitor(this);
-    m_pool[UIActionIndexST_M_VMResourceMonitor_M_Columns] = new UIActionMenuSelectorVMResourceMonitorToggleColumns(this);
-    m_pool[UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance] = new UIActionMenuSelectorVMResourceMonitorSwitchToMachinePerformance(this);
+    m_pool[UIActionIndexMN_M_VMResourceMonitor] = new UIActionMenuVMResourceMonitor(this);
+    m_pool[UIActionIndexMN_M_VMResourceMonitor_M_Columns] = new UIActionMenuSelectorVMResourceMonitorToggleColumns(this);
+    m_pool[UIActionIndexMN_M_VMResourceMonitor_S_SwitchToMachinePerformance] = new UIActionMenuSelectorVMResourceMonitorSwitchToMachinePerformance(this);
 
     /* 'Group' action groups: */
-    m_groupPool[UIActionIndexST_M_Group_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexST_M_Group_M_Tools));
-    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Details));
-    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
-    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Logs));
-    m_groupPool[UIActionIndexST_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Group_M_Tools_T_Performance));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexMN_M_Group_M_Tools));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Details));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Snapshots));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Logs));
+    m_groupPool[UIActionIndexMN_M_Group_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Group_M_Tools_T_Performance));
 
     /* 'Machine' action groups: */
-    m_groupPool[UIActionIndexST_M_Machine_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexST_M_Machine_M_Tools));
-    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Details));
-    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
-    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Logs));
-    m_groupPool[UIActionIndexST_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexST_M_Machine_M_Tools_T_Performance));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools] = new QActionGroup(m_pool.value(UIActionIndexMN_M_Machine_M_Tools));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Details));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Logs));
+    m_groupPool[UIActionIndexMN_M_Machine_M_Tools]->addAction(m_pool.value(UIActionIndexMN_M_Machine_M_Tools_T_Performance));
 
     /* Prepare update-handlers for known menus: */
-    m_menuUpdateHandlers[UIActionIndexST_M_File].ptfm =                  &UIActionPoolManager::updateMenuFile;
-    m_menuUpdateHandlers[UIActionIndexST_M_Welcome].ptfm =               &UIActionPoolManager::updateMenuWelcome;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_MoveToGroup].ptfm =   &UIActionPoolManager::updateMenuGroupMoveToGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup].ptfm = &UIActionPoolManager::updateMenuMachineMoveToGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_StartOrShow].ptfm =   &UIActionPoolManager::updateMenuGroupStartOrShow;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_StartOrShow].ptfm = &UIActionPoolManager::updateMenuMachineStartOrShow;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Console].ptfm =       &UIActionPoolManager::updateMenuGroupConsole;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Console].ptfm =     &UIActionPoolManager::updateMenuMachineConsole;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close].ptfm =         &UIActionPoolManager::updateMenuGroupClose;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close].ptfm =       &UIActionPoolManager::updateMenuMachineClose;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Tools].ptfm =         &UIActionPoolManager::updateMenuGroupTools;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Tools].ptfm =       &UIActionPoolManager::updateMenuMachineTools;
-    m_menuUpdateHandlers[UIActionIndexST_M_MediumWindow].ptfm =          &UIActionPoolManager::updateMenuMediumWindow;
-    m_menuUpdateHandlers[UIActionIndexST_M_Medium].ptfm =                &UIActionPoolManager::updateMenuMedium;
-    m_menuUpdateHandlers[UIActionIndexST_M_NetworkWindow].ptfm =         &UIActionPoolManager::updateMenuNetworkWindow;
-    m_menuUpdateHandlers[UIActionIndexST_M_Network].ptfm =               &UIActionPoolManager::updateMenuNetwork;
-    m_menuUpdateHandlers[UIActionIndexST_M_CloudWindow].ptfm =           &UIActionPoolManager::updateMenuCloudWindow;
-    m_menuUpdateHandlers[UIActionIndexST_M_Cloud].ptfm =                 &UIActionPoolManager::updateMenuCloud;
-    m_menuUpdateHandlers[UIActionIndexST_M_CloudConsoleWindow].ptfm =    &UIActionPoolManager::updateMenuCloudConsoleWindow;
-    m_menuUpdateHandlers[UIActionIndexST_M_CloudConsole].ptfm =          &UIActionPoolManager::updateMenuCloudConsole;
-    m_menuUpdateHandlers[UIActionIndexST_M_VMResourceMonitor].ptfm =     &UIActionPoolManager::updateMenuVMResourceMonitor;
-    m_menuUpdateHandlers[UIActionIndexST_M_Snapshot].ptfm =              &UIActionPoolManager::updateMenuSnapshot;
+    m_menuUpdateHandlers[UIActionIndexMN_M_File].ptfm =                  &UIActionPoolManager::updateMenuFile;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Welcome].ptfm =               &UIActionPoolManager::updateMenuWelcome;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group].ptfm =                 &UIActionPoolManager::updateMenuGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine].ptfm =               &UIActionPoolManager::updateMenuMachine;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_MoveToGroup].ptfm =   &UIActionPoolManager::updateMenuGroupMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_MoveToGroup].ptfm = &UIActionPoolManager::updateMenuMachineMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_StartOrShow].ptfm =   &UIActionPoolManager::updateMenuGroupStartOrShow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_StartOrShow].ptfm = &UIActionPoolManager::updateMenuMachineStartOrShow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Console].ptfm =       &UIActionPoolManager::updateMenuGroupConsole;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Console].ptfm =     &UIActionPoolManager::updateMenuMachineConsole;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Close].ptfm =         &UIActionPoolManager::updateMenuGroupClose;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Close].ptfm =       &UIActionPoolManager::updateMenuMachineClose;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Tools].ptfm =         &UIActionPoolManager::updateMenuGroupTools;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Tools].ptfm =       &UIActionPoolManager::updateMenuMachineTools;
+    m_menuUpdateHandlers[UIActionIndexMN_M_MediumWindow].ptfm =          &UIActionPoolManager::updateMenuMediumWindow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Medium].ptfm =                &UIActionPoolManager::updateMenuMedium;
+    m_menuUpdateHandlers[UIActionIndexMN_M_NetworkWindow].ptfm =         &UIActionPoolManager::updateMenuNetworkWindow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Network].ptfm =               &UIActionPoolManager::updateMenuNetwork;
+    m_menuUpdateHandlers[UIActionIndexMN_M_CloudWindow].ptfm =           &UIActionPoolManager::updateMenuCloudWindow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Cloud].ptfm =                 &UIActionPoolManager::updateMenuCloud;
+    m_menuUpdateHandlers[UIActionIndexMN_M_CloudConsoleWindow].ptfm =    &UIActionPoolManager::updateMenuCloudConsoleWindow;
+    m_menuUpdateHandlers[UIActionIndexMN_M_CloudConsole].ptfm =          &UIActionPoolManager::updateMenuCloudConsole;
+    m_menuUpdateHandlers[UIActionIndexMN_M_VMResourceMonitor].ptfm =     &UIActionPoolManager::updateMenuVMResourceMonitor;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Snapshot].ptfm =              &UIActionPoolManager::updateMenuSnapshot;
 
     /* Call to base-class: */
@@ -3595 +3595 @@
 
     /* 'File' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_File));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_File));
     updateMenuFile();
 
     /* 'Welcome' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Welcome));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Welcome));
     updateMenuWelcome();
     /* 'Group' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Group));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Group));
     updateMenuGroup();
     /* 'Machine' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Machine));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Machine));
     updateMenuMachine();
 
@@ -3624 +3624 @@
 
     /* 'Virtual Media Manager' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Medium));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Medium));
     updateMenuMediumWindow();
     updateMenuMedium();
     /* 'Host Network Manager' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Network));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Network));
     updateMenuNetworkWindow();
     updateMenuNetwork();
     /* 'Cloud Profile Manager' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Cloud));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Cloud));
     updateMenuCloudWindow();
     updateMenuCloud();
 
     /* 'VM Resource Monitor' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_VMResourceMonitor));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_VMResourceMonitor));
     updateMenuVMResourceMonitor();
 
     /* 'Snapshot' menu: */
-    addMenu(m_mainMenus, action(UIActionIndexST_M_Snapshot));
+    addMenu(m_mainMenus, action(UIActionIndexMN_M_Snapshot));
     updateMenuSnapshot();
     /* 'Log' menu: */
@@ -3659 +3659 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_File)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_File)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3686 +3686 @@
     pMenu->addAction(action(UIActionIndex_M_Application_S_Preferences));
     /* 'Close' action goes to Application menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_Close));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_Close));
 
     /* 'Import Appliance' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ImportAppliance));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ImportAppliance));
     /* 'Export Appliance' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ExportAppliance));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ExportAppliance));
     /* 'New Cloud VM' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_NewCloudVM));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_NewCloudVM));
 # ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /* 'Show Extra-data Manager' action goes to 'File' menu for Debug build: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowExtraDataManager));
 # endif
     /* 'Show Virtual Medium Manager' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
     /* 'Show Host Network Manager' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
     if (fExtPackAccessible)
-        pMenu->addAction(action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+        pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -3713 +3713 @@
     pMenu->addSeparator();
     /* 'Import Appliance' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ImportAppliance));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ImportAppliance));
     /* 'Export Appliance' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ExportAppliance));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ExportAppliance));
     /* 'New Cloud VM' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_NewCloudVM));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_NewCloudVM));
     /* Separator after 'Export Appliance' action of the 'File' menu: */
     pMenu->addSeparator();
 # ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
     /* 'Extra-data Manager' action goes to 'File' menu for Debug build: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowExtraDataManager));
 # endif
     /* 'Show Virtual Medium Manager' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
     /* 'Show Host Network Manager' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
     /* 'Show Cloud Profile Manager' action goes to 'File' menu: */
     if (fExtPackAccessible)
-        pMenu->addAction(action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+        pMenu->addAction(action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* 'Network Access Manager' action goes to 'File' menu: */
@@ -3745 +3745 @@
     pMenu->addSeparator();
     /* 'Close' action goes to 'File' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_File_S_Close));
+    pMenu->addAction(action(UIActionIndexMN_M_File_S_Close));
 
 #endif /* !VBOX_WS_MAC */
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_File);
+    m_invalidations.remove(UIActionIndexMN_M_File);
 }
 
@@ -3756 +3756 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Welcome)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Welcome)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3762 +3762 @@
 
     /* Populate Welcome menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Welcome_S_New));
-    pMenu->addAction(action(UIActionIndexST_M_Welcome_S_Add));
+    pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_New));
+    pMenu->addAction(action(UIActionIndexMN_M_Welcome_S_Add));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Welcome);
+    m_invalidations.remove(UIActionIndexMN_M_Welcome);
 }
 
@@ -3772 +3772 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3783 +3783 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3794 +3794 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_MoveToGroup)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_MoveToGroup)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3805 +3805 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_MoveToGroup)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_MoveToGroup)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3811 +3811 @@
 
     /* Populate 'Machine' / 'Move to Group' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_MoveToGroup_S_New));
 
     /* This menu always remains invalid.. */
@@ -3819 +3819 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_StartOrShow)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_StartOrShow)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3825 +3825 @@
 
     /* Populate 'Group' / 'Start or Show' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Group_M_StartOrShow);
+    m_invalidations.remove(UIActionIndexMN_M_Group_M_StartOrShow);
 }
 
@@ -3836 +3836 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_StartOrShow)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_StartOrShow)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3842 +3842 @@
 
     /* Populate 'Machine' / 'Start or Show' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Machine_M_StartOrShow);
+    m_invalidations.remove(UIActionIndexMN_M_Machine_M_StartOrShow);
 }
 
@@ -3853 +3853 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_Console)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_Console)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3864 +3864 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_Console)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_Console)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3875 +3875 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_Close)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_Close)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3881 +3881 @@
 
     /* Populate 'Group' / 'Close' menu: */
-    // pMenu->addAction(action(UIActionIndexST_M_Group_M_Close_S_Detach));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Close_S_SaveState));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Close_S_Shutdown));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Close_S_PowerOff));
+    // pMenu->addAction(action(UIActionIndexMN_M_Group_M_Close_S_Detach));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Close_S_SaveState));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Close_S_Shutdown));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Close_S_PowerOff));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Group_M_Close);
+    m_invalidations.remove(UIActionIndexMN_M_Group_M_Close);
 }
 
@@ -3893 +3893 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_Close)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_Close)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3899 +3899 @@
 
     /* Populate 'Machine' / 'Close' menu: */
-    // pMenu->addAction(action(UIActionIndexST_M_Machine_M_Close_S_Detach));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Close_S_SaveState));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Close_S_Shutdown));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Close_S_PowerOff));
+    // pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Close_S_Detach));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Close_S_SaveState));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Machine_M_Close);
+    m_invalidations.remove(UIActionIndexMN_M_Machine_M_Close);
 }
 
@@ -3911 +3911 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Group_M_Tools)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Group_M_Tools)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3917 +3917 @@
 
     /* Populate 'Group' / 'Tools' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Details));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Snapshots));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Logs));
-    pMenu->addAction(action(UIActionIndexST_M_Group_M_Tools_T_Performance));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Details));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Logs));
+    pMenu->addAction(action(UIActionIndexMN_M_Group_M_Tools_T_Performance));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Group_M_Tools);
+    m_invalidations.remove(UIActionIndexMN_M_Group_M_Tools);
 }
 
@@ -3929 +3929 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Machine_M_Tools)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Machine_M_Tools)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -3935 +3935 @@
 
     /* Populate 'Machine' / 'Tools' menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Details));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Logs));
-    pMenu->addAction(action(UIActionIndexST_M_Machine_M_Tools_T_Performance));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Details));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Logs));
+    pMenu->addAction(action(UIActionIndexMN_M_Machine_M_Tools_T_Performance));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Machine_M_Tools);
+    m_invalidations.remove(UIActionIndexMN_M_Machine_M_Tools);
 }
 
@@ -3947 +3947 @@
 {
     /* Update corresponding menu: */
-    updateMenuMediumWrapper(action(UIActionIndexST_M_MediumWindow)->menu());
+    updateMenuMediumWrapper(action(UIActionIndexMN_M_MediumWindow)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_MediumWindow);
+    m_invalidations.remove(UIActionIndexMN_M_MediumWindow);
 }
 
@@ -3956 +3956 @@
 {
     /* Update corresponding menu: */
-    updateMenuMediumWrapper(action(UIActionIndexST_M_Medium)->menu());
+    updateMenuMediumWrapper(action(UIActionIndexMN_M_Medium)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Medium);
+    m_invalidations.remove(UIActionIndexMN_M_Medium);
 }
 
@@ -3971 +3971 @@
 
     /* 'Add' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Add)) || fSeparator;
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Create)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Add)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Create)) || fSeparator;
 
     /* Separator? */
@@ -3982 +3982 @@
 
     /* 'Copy' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Copy)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Copy)) || fSeparator;
     /* 'Move' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Move)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Move)) || fSeparator;
     /* 'Remove' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Remove)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Remove)) || fSeparator;
     /* 'Release' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Release)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Release)) || fSeparator;
     /* 'Search' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_T_Search)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_T_Search)) || fSeparator;
     /* 'Properties' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_T_Details)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_T_Details)) || fSeparator;
 
     /* Separator? */
@@ -4002 +4002 @@
 
     /* 'Refresh' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Medium_S_Refresh)) || fSeparator;;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Medium_S_Refresh)) || fSeparator;;
 }
 
@@ -4008 +4008 @@
 {
     /* Update corresponding menu: */
-    updateMenuNetworkWrapper(action(UIActionIndexST_M_NetworkWindow)->menu());
+    updateMenuNetworkWrapper(action(UIActionIndexMN_M_NetworkWindow)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_NetworkWindow);
+    m_invalidations.remove(UIActionIndexMN_M_NetworkWindow);
 }
 
@@ -4017 +4017 @@
 {
     /* Update corresponding menu: */
-    updateMenuNetworkWrapper(action(UIActionIndexST_M_Network)->menu());
+    updateMenuNetworkWrapper(action(UIActionIndexMN_M_Network)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Network);
+    m_invalidations.remove(UIActionIndexMN_M_Network);
 }
 
@@ -4032 +4032 @@
 
     /* 'Create' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_S_Create)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Network_S_Create)) || fSeparator;
 
     /* Separator? */
@@ -4042 +4042 @@
 
     /* 'Remove' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_S_Remove)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Network_S_Remove)) || fSeparator;
     /* 'Properties' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_T_Details)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Network_T_Details)) || fSeparator;
 
 //    /* Separator? */
@@ -4054 +4054 @@
 
 //    /* 'Refresh' action: */
-//    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Network_S_Refresh)) || fSeparator;;
+//    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Network_S_Refresh)) || fSeparator;;
 }
 
@@ -4060 +4060 @@
 {
     /* Update corresponding menu: */
-    updateMenuCloudWrapper(action(UIActionIndexST_M_CloudWindow)->menu());
+    updateMenuCloudWrapper(action(UIActionIndexMN_M_CloudWindow)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_CloudWindow);
+    m_invalidations.remove(UIActionIndexMN_M_CloudWindow);
 }
 
@@ -4069 +4069 @@
 {
     /* Update corresponding menu: */
-    updateMenuCloudWrapper(action(UIActionIndexST_M_Cloud)->menu());
+    updateMenuCloudWrapper(action(UIActionIndexMN_M_Cloud)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Cloud);
+    m_invalidations.remove(UIActionIndexMN_M_Cloud);
 }
 
@@ -4084 +4084 @@
 
     /* 'Add' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Add)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_S_Add)) || fSeparator;
     /* 'Import' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Import)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_S_Import)) || fSeparator;
 
     /* Separator? */
@@ -4096 +4096 @@
 
     /* 'Remove' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Remove)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_S_Remove)) || fSeparator;
     /* 'Properties' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_T_Details)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_T_Details)) || fSeparator;
 
     /* Separator? */
@@ -4108 +4108 @@
 
     /* 'Try Page' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_TryPage)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_S_TryPage)) || fSeparator;
     /* 'Help' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_Cloud_S_Help)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_Cloud_S_Help)) || fSeparator;
 }
 
@@ -4116 +4116 @@
 {
     /* Update corresponding menu: */
-    updateMenuCloudConsoleWrapper(action(UIActionIndexST_M_CloudConsoleWindow)->menu());
+    updateMenuCloudConsoleWrapper(action(UIActionIndexMN_M_CloudConsoleWindow)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_CloudConsoleWindow);
+    m_invalidations.remove(UIActionIndexMN_M_CloudConsoleWindow);
 }
 
@@ -4125 +4125 @@
 {
     /* Update corresponding menu: */
-    updateMenuCloudConsoleWrapper(action(UIActionIndexST_M_CloudConsole)->menu());
+    updateMenuCloudConsoleWrapper(action(UIActionIndexMN_M_CloudConsole)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_CloudConsole);
+    m_invalidations.remove(UIActionIndexMN_M_CloudConsole);
 }
 
@@ -4140 +4140 @@
 
     /* 'Add Application' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ApplicationAdd)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_CloudConsole_S_ApplicationAdd)) || fSeparator;
     /* 'Remove Application' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ApplicationRemove)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_CloudConsole_S_ApplicationRemove)) || fSeparator;
 
     /* Separator? */
@@ -4152 +4152 @@
 
     /* 'Add Profile' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ProfileAdd)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_CloudConsole_S_ProfileAdd)) || fSeparator;
     /* 'Remove Profile' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_S_ProfileRemove)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_CloudConsole_S_ProfileRemove)) || fSeparator;
 
     /* Separator? */
@@ -4164 +4164 @@
 
     /* 'Properties' action: */
-    fSeparator = addAction(pMenu, action(UIActionIndexST_M_CloudConsole_T_Details)) || fSeparator;
+    fSeparator = addAction(pMenu, action(UIActionIndexMN_M_CloudConsole_T_Details)) || fSeparator;
 }
 
@@ -4170 +4170 @@
 {
     /* Update corresponding menu: */
-    updateMenuVMResourceMonitorWrapper(action(UIActionIndexST_M_VMResourceMonitor)->menu());
+    updateMenuVMResourceMonitorWrapper(action(UIActionIndexMN_M_VMResourceMonitor)->menu());
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_VMResourceMonitor);
+    m_invalidations.remove(UIActionIndexMN_M_VMResourceMonitor);
 }
 
@@ -4180 +4180 @@
     /* Clear contents: */
     pMenu->clear();
-    addAction(pMenu, action(UIActionIndexST_M_VMResourceMonitor_M_Columns));
-    addAction(pMenu, action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance));
+    addAction(pMenu, action(UIActionIndexMN_M_VMResourceMonitor_M_Columns));
+    addAction(pMenu, action(UIActionIndexMN_M_VMResourceMonitor_S_SwitchToMachinePerformance));
 }
 
@@ -4187 +4187 @@
 {
     /* Get corresponding menu: */
-    UIMenu *pMenu = action(UIActionIndexST_M_Snapshot)->menu();
+    UIMenu *pMenu = action(UIActionIndexMN_M_Snapshot)->menu();
     AssertPtrReturnVoid(pMenu);
     /* Clear contents: */
@@ -4193 +4193 @@
 
     /* Populate Snapshot-menu: */
-    pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Take));
-    pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Delete));
-    pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Restore));
-    pMenu->addAction(action(UIActionIndexST_M_Snapshot_T_Properties));
-    pMenu->addAction(action(UIActionIndexST_M_Snapshot_S_Clone));
+    pMenu->addAction(action(UIActionIndexMN_M_Snapshot_S_Take));
+    pMenu->addAction(action(UIActionIndexMN_M_Snapshot_S_Delete));
+    pMenu->addAction(action(UIActionIndexMN_M_Snapshot_S_Restore));
+    pMenu->addAction(action(UIActionIndexMN_M_Snapshot_T_Properties));
+    pMenu->addAction(action(UIActionIndexMN_M_Snapshot_S_Clone));
 
     /* Mark menu as valid: */
-    m_invalidations.remove(UIActionIndexST_M_Snapshot);
+    m_invalidations.remove(UIActionIndexMN_M_Snapshot);
 }
 
@@ -4220 +4220 @@
     switch (iIndex)
     {
-        case UIActionIndexST_M_Welcome:
+        case UIActionIndexMN_M_Welcome:
         {
-            actions << action(UIActionIndexST_M_Welcome_S_New)
-                    << action(UIActionIndexST_M_Welcome_S_Add);
+            actions << action(UIActionIndexMN_M_Welcome_S_New)
+                    << action(UIActionIndexMN_M_Welcome_S_Add);
             break;
         }
-        case UIActionIndexST_M_Group:
+        case UIActionIndexMN_M_Group:
         {
-            actions << action(UIActionIndexST_M_Group_S_New)
-                    << action(UIActionIndexST_M_Group_S_Add)
-                    << action(UIActionIndexST_M_Group_S_Rename)
-                    << action(UIActionIndexST_M_Group_S_Remove)
-                    << action(UIActionIndexST_M_Group_M_MoveToGroup)
-                    << action(UIActionIndexST_M_Group_M_StartOrShow)
-                    << action(UIActionIndexST_M_Group_T_Pause)
-                    << action(UIActionIndexST_M_Group_S_Reset)
-                    << action(UIActionIndexST_M_Group_S_Discard)
-                    << action(UIActionIndexST_M_Group_S_ShowLogDialog)
-                    << action(UIActionIndexST_M_Group_S_Refresh)
-                    << action(UIActionIndexST_M_Group_S_ShowInFileManager)
-                    << action(UIActionIndexST_M_Group_S_CreateShortcut)
-                    << action(UIActionIndexST_M_Group_S_Sort)
-                    << action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal)
-                    << action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless)
-                    << action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable)
-                    << action(UIActionIndexST_M_Group_M_Console_S_CreateConnection)
-                    << action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection)
-                    << action(UIActionIndexST_M_Group_M_Console_S_ConfigureApplications)
-                    // << action(UIActionIndexST_M_Group_M_Close_S_Detach)
-                    << action(UIActionIndexST_M_Group_M_Close_S_SaveState)
-                    << action(UIActionIndexST_M_Group_M_Close_S_Shutdown)
-                    << action(UIActionIndexST_M_Group_M_Close_S_PowerOff)
-                    << action(UIActionIndexST_M_Group_M_Tools_T_Details)
-                    << action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)
-                    << action(UIActionIndexST_M_Group_M_Tools_T_Logs)
-                    << action(UIActionIndexST_M_Group_M_Tools_T_Performance);
+            actions << action(UIActionIndexMN_M_Group_S_New)
+                    << action(UIActionIndexMN_M_Group_S_Add)
+                    << action(UIActionIndexMN_M_Group_S_Rename)
+                    << action(UIActionIndexMN_M_Group_S_Remove)
+                    << action(UIActionIndexMN_M_Group_M_MoveToGroup)
+                    << action(UIActionIndexMN_M_Group_M_StartOrShow)
+                    << action(UIActionIndexMN_M_Group_T_Pause)
+                    << action(UIActionIndexMN_M_Group_S_Reset)
+                    << action(UIActionIndexMN_M_Group_S_Discard)
+                    << action(UIActionIndexMN_M_Group_S_ShowLogDialog)
+                    << action(UIActionIndexMN_M_Group_S_Refresh)
+                    << action(UIActionIndexMN_M_Group_S_ShowInFileManager)
+                    << action(UIActionIndexMN_M_Group_S_CreateShortcut)
+                    << action(UIActionIndexMN_M_Group_S_Sort)
+                    << action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal)
+                    << action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless)
+                    << action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable)
+                    << action(UIActionIndexMN_M_Group_M_Console_S_CreateConnection)
+                    << action(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection)
+                    << action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications)
+                    // << action(UIActionIndexMN_M_Group_M_Close_S_Detach)
+                    << action(UIActionIndexMN_M_Group_M_Close_S_SaveState)
+                    << action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)
+                    << action(UIActionIndexMN_M_Group_M_Close_S_PowerOff)
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_Details)
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots)
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_Logs)
+                    << action(UIActionIndexMN_M_Group_M_Tools_T_Performance);
             break;
         }
-        case UIActionIndexST_M_Machine:
+        case UIActionIndexMN_M_Machine:
         {
-            actions << action(UIActionIndexST_M_Machine_S_New)
-                    << action(UIActionIndexST_M_Machine_S_Add)
-                    << action(UIActionIndexST_M_Machine_S_Settings)
-                    << action(UIActionIndexST_M_Machine_S_Clone)
-                    << action(UIActionIndexST_M_Machine_S_Move)
-                    << action(UIActionIndexST_M_Machine_S_ExportToOCI)
-                    << action(UIActionIndexST_M_Machine_S_Remove)
-                    << action(UIActionIndexST_M_Machine_M_MoveToGroup)
-                    << action(UIActionIndexST_M_Machine_M_StartOrShow)
-                    << action(UIActionIndexST_M_Machine_T_Pause)
-                    << action(UIActionIndexST_M_Machine_S_Reset)
-                    << action(UIActionIndexST_M_Machine_S_Discard)
-                    << action(UIActionIndexST_M_Machine_S_ShowLogDialog)
-                    << action(UIActionIndexST_M_Machine_S_Refresh)
-                    << action(UIActionIndexST_M_Machine_S_ShowInFileManager)
-                    << action(UIActionIndexST_M_Machine_S_CreateShortcut)
-                    << action(UIActionIndexST_M_Machine_S_SortParent)
-                    << action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)
-                    << action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal)
-                    << action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless)
-                    << action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows)
-                    << action(UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications)
-                    // << action(UIActionIndexST_M_Machine_M_Close_S_Detach)
-                    << action(UIActionIndexST_M_Machine_M_Close_S_SaveState)
-                    << action(UIActionIndexST_M_Machine_M_Close_S_Shutdown)
-                    << action(UIActionIndexST_M_Machine_M_Close_S_PowerOff)
-                    << action(UIActionIndexST_M_Machine_M_Tools_T_Details)
-                    << action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)
-                    << action(UIActionIndexST_M_Machine_M_Tools_T_Logs)
-                    << action(UIActionIndexST_M_Machine_M_Tools_T_Performance);
+            actions << action(UIActionIndexMN_M_Machine_S_New)
+                    << action(UIActionIndexMN_M_Machine_S_Add)
+                    << action(UIActionIndexMN_M_Machine_S_Settings)
+                    << action(UIActionIndexMN_M_Machine_S_Clone)
+                    << action(UIActionIndexMN_M_Machine_S_Move)
+                    << action(UIActionIndexMN_M_Machine_S_ExportToOCI)
+                    << action(UIActionIndexMN_M_Machine_S_Remove)
+                    << action(UIActionIndexMN_M_Machine_M_MoveToGroup)
+                    << action(UIActionIndexMN_M_Machine_M_StartOrShow)
+                    << action(UIActionIndexMN_M_Machine_T_Pause)
+                    << action(UIActionIndexMN_M_Machine_S_Reset)
+                    << action(UIActionIndexMN_M_Machine_S_Discard)
+                    << action(UIActionIndexMN_M_Machine_S_ShowLogDialog)
+                    << action(UIActionIndexMN_M_Machine_S_Refresh)
+                    << action(UIActionIndexMN_M_Machine_S_ShowInFileManager)
+                    << action(UIActionIndexMN_M_Machine_S_CreateShortcut)
+                    << action(UIActionIndexMN_M_Machine_S_SortParent)
+                    << action(UIActionIndexMN_M_Machine_M_MoveToGroup_S_New)
+                    << action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal)
+                    << action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless)
+                    << action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_CreateConnection)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows)
+                    << action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications)
+                    // << action(UIActionIndexMN_M_Machine_M_Close_S_Detach)
+                    << action(UIActionIndexMN_M_Machine_M_Close_S_SaveState)
+                    << action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)
+                    << action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff)
+                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Details)
+                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots)
+                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Logs)
+                    << action(UIActionIndexMN_M_Machine_M_Tools_T_Performance);
             break;
         }

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

@@ -30 +30 @@
 
 
-/** Runtime action-pool index enum.
+/** VirtualBox Manager action-pool index enum.
   * Naming convention is following:
   * 1. Every menu index prepended with 'M',
@@ -37 +37 @@
   * 4. Every polymorphic-action index presended with 'P',
   * 5. Every sub-index contains full parent-index name. */
-enum UIActionIndexST
+enum UIActionIndexMN
 {
     /* 'File' menu actions: */
-    UIActionIndexST_M_File = UIActionIndex_Max + 1,
-    UIActionIndexST_M_File_S_ShowVirtualMediumManager,
-    UIActionIndexST_M_File_S_ShowHostNetworkManager,
-    UIActionIndexST_M_File_S_ShowCloudProfileManager,
-    UIActionIndexST_M_File_S_ImportAppliance,
-    UIActionIndexST_M_File_S_ExportAppliance,
-    UIActionIndexST_M_File_S_NewCloudVM,
+    UIActionIndexMN_M_File = UIActionIndex_Max + 1,
+    UIActionIndexMN_M_File_S_ShowVirtualMediumManager,
+    UIActionIndexMN_M_File_S_ShowHostNetworkManager,
+    UIActionIndexMN_M_File_S_ShowCloudProfileManager,
+    UIActionIndexMN_M_File_S_ImportAppliance,
+    UIActionIndexMN_M_File_S_ExportAppliance,
+    UIActionIndexMN_M_File_S_NewCloudVM,
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-    UIActionIndexST_M_File_S_ShowExtraDataManager,
+    UIActionIndexMN_M_File_S_ShowExtraDataManager,
 #endif
-    UIActionIndexST_M_File_S_Close,
+    UIActionIndexMN_M_File_S_Close,
 
     /* 'Welcome' menu actions: */
-    UIActionIndexST_M_Welcome,
-    UIActionIndexST_M_Welcome_S_New,
-    UIActionIndexST_M_Welcome_S_Add,
+    UIActionIndexMN_M_Welcome,
+    UIActionIndexMN_M_Welcome_S_New,
+    UIActionIndexMN_M_Welcome_S_Add,
 
     /* 'Group' menu actions: */
-    UIActionIndexST_M_Group,
-    UIActionIndexST_M_Group_S_New,
-    UIActionIndexST_M_Group_S_Add,
-    UIActionIndexST_M_Group_S_Rename,
-    UIActionIndexST_M_Group_S_Remove,
-    UIActionIndexST_M_Group_M_MoveToGroup,
-    UIActionIndexST_M_Group_M_StartOrShow,
-    UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal,
-    UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless,
-    UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable,
-    UIActionIndexST_M_Group_T_Pause,
-    UIActionIndexST_M_Group_S_Reset,
-    UIActionIndexST_M_Group_M_Console,
-    UIActionIndexST_M_Group_M_Console_S_CreateConnection,
-    UIActionIndexST_M_Group_M_Console_S_DeleteConnection,
-    UIActionIndexST_M_Group_M_Console_S_ConfigureApplications,
-    UIActionIndexST_M_Group_M_Close,
-    UIActionIndexST_M_Group_M_Close_S_Detach,
-    UIActionIndexST_M_Group_M_Close_S_SaveState,
-    UIActionIndexST_M_Group_M_Close_S_Shutdown,
-    UIActionIndexST_M_Group_M_Close_S_PowerOff,
-    UIActionIndexST_M_Group_M_Tools,
-    UIActionIndexST_M_Group_M_Tools_T_Details,
-    UIActionIndexST_M_Group_M_Tools_T_Snapshots,
-    UIActionIndexST_M_Group_M_Tools_T_Logs,
-    UIActionIndexST_M_Group_M_Tools_T_Performance,
-    UIActionIndexST_M_Group_S_Discard,
-    UIActionIndexST_M_Group_S_ShowLogDialog,
-    UIActionIndexST_M_Group_S_Refresh,
-    UIActionIndexST_M_Group_S_ShowInFileManager,
-    UIActionIndexST_M_Group_S_CreateShortcut,
-    UIActionIndexST_M_Group_S_Sort,
+    UIActionIndexMN_M_Group,
+    UIActionIndexMN_M_Group_S_New,
+    UIActionIndexMN_M_Group_S_Add,
+    UIActionIndexMN_M_Group_S_Rename,
+    UIActionIndexMN_M_Group_S_Remove,
+    UIActionIndexMN_M_Group_M_MoveToGroup,
+    UIActionIndexMN_M_Group_M_StartOrShow,
+    UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal,
+    UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless,
+    UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable,
+    UIActionIndexMN_M_Group_T_Pause,
+    UIActionIndexMN_M_Group_S_Reset,
+    UIActionIndexMN_M_Group_M_Console,
+    UIActionIndexMN_M_Group_M_Console_S_CreateConnection,
+    UIActionIndexMN_M_Group_M_Console_S_DeleteConnection,
+    UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications,
+    UIActionIndexMN_M_Group_M_Close,
+    UIActionIndexMN_M_Group_M_Close_S_Detach,
+    UIActionIndexMN_M_Group_M_Close_S_SaveState,
+    UIActionIndexMN_M_Group_M_Close_S_Shutdown,
+    UIActionIndexMN_M_Group_M_Close_S_PowerOff,
+    UIActionIndexMN_M_Group_M_Tools,
+    UIActionIndexMN_M_Group_M_Tools_T_Details,
+    UIActionIndexMN_M_Group_M_Tools_T_Snapshots,
+    UIActionIndexMN_M_Group_M_Tools_T_Logs,
+    UIActionIndexMN_M_Group_M_Tools_T_Performance,
+    UIActionIndexMN_M_Group_S_Discard,
+    UIActionIndexMN_M_Group_S_ShowLogDialog,
+    UIActionIndexMN_M_Group_S_Refresh,
+    UIActionIndexMN_M_Group_S_ShowInFileManager,
+    UIActionIndexMN_M_Group_S_CreateShortcut,
+    UIActionIndexMN_M_Group_S_Sort,
 
     /* 'Machine' menu actions: */
-    UIActionIndexST_M_Machine,
-    UIActionIndexST_M_Machine_S_New,
-    UIActionIndexST_M_Machine_S_Add,
-    UIActionIndexST_M_Machine_S_Settings,
-    UIActionIndexST_M_Machine_S_Clone,
-    UIActionIndexST_M_Machine_S_Move,
-    UIActionIndexST_M_Machine_S_ExportToOCI,
-    UIActionIndexST_M_Machine_S_Remove,
-    UIActionIndexST_M_Machine_M_MoveToGroup,
-    UIActionIndexST_M_Machine_M_MoveToGroup_S_New,
-    UIActionIndexST_M_Machine_M_StartOrShow,
-    UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal,
-    UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless,
-    UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable,
-    UIActionIndexST_M_Machine_T_Pause,
-    UIActionIndexST_M_Machine_S_Reset,
-    UIActionIndexST_M_Machine_M_Console,
-    UIActionIndexST_M_Machine_M_Console_S_CreateConnection,
-    UIActionIndexST_M_Machine_M_Console_S_DeleteConnection,
-    UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix,
-    UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows,
-    UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix,
-    UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows,
-    UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications,
-    UIActionIndexST_M_Machine_M_Close,
-    UIActionIndexST_M_Machine_M_Close_S_Detach,
-    UIActionIndexST_M_Machine_M_Close_S_SaveState,
-    UIActionIndexST_M_Machine_M_Close_S_Shutdown,
-    UIActionIndexST_M_Machine_M_Close_S_PowerOff,
-    UIActionIndexST_M_Machine_M_Tools,
-    UIActionIndexST_M_Machine_M_Tools_T_Details,
-    UIActionIndexST_M_Machine_M_Tools_T_Snapshots,
-    UIActionIndexST_M_Machine_M_Tools_T_Logs,
-    UIActionIndexST_M_Machine_M_Tools_T_Performance,
-    UIActionIndexST_M_Machine_S_Discard,
-    UIActionIndexST_M_Machine_S_ShowLogDialog,
-    UIActionIndexST_M_Machine_S_Refresh,
-    UIActionIndexST_M_Machine_S_ShowInFileManager,
-    UIActionIndexST_M_Machine_S_CreateShortcut,
-    UIActionIndexST_M_Machine_S_SortParent,
-    UIActionIndexST_M_Machine_T_Search,
+    UIActionIndexMN_M_Machine,
+    UIActionIndexMN_M_Machine_S_New,
+    UIActionIndexMN_M_Machine_S_Add,
+    UIActionIndexMN_M_Machine_S_Settings,
+    UIActionIndexMN_M_Machine_S_Clone,
+    UIActionIndexMN_M_Machine_S_Move,
+    UIActionIndexMN_M_Machine_S_ExportToOCI,
+    UIActionIndexMN_M_Machine_S_Remove,
+    UIActionIndexMN_M_Machine_M_MoveToGroup,
+    UIActionIndexMN_M_Machine_M_MoveToGroup_S_New,
+    UIActionIndexMN_M_Machine_M_StartOrShow,
+    UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal,
+    UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless,
+    UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable,
+    UIActionIndexMN_M_Machine_T_Pause,
+    UIActionIndexMN_M_Machine_S_Reset,
+    UIActionIndexMN_M_Machine_M_Console,
+    UIActionIndexMN_M_Machine_M_Console_S_CreateConnection,
+    UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection,
+    UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix,
+    UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows,
+    UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix,
+    UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows,
+    UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications,
+    UIActionIndexMN_M_Machine_M_Close,
+    UIActionIndexMN_M_Machine_M_Close_S_Detach,
+    UIActionIndexMN_M_Machine_M_Close_S_SaveState,
+    UIActionIndexMN_M_Machine_M_Close_S_Shutdown,
+    UIActionIndexMN_M_Machine_M_Close_S_PowerOff,
+    UIActionIndexMN_M_Machine_M_Tools,
+    UIActionIndexMN_M_Machine_M_Tools_T_Details,
+    UIActionIndexMN_M_Machine_M_Tools_T_Snapshots,
+    UIActionIndexMN_M_Machine_M_Tools_T_Logs,
+    UIActionIndexMN_M_Machine_M_Tools_T_Performance,
+    UIActionIndexMN_M_Machine_S_Discard,
+    UIActionIndexMN_M_Machine_S_ShowLogDialog,
+    UIActionIndexMN_M_Machine_S_Refresh,
+    UIActionIndexMN_M_Machine_S_ShowInFileManager,
+    UIActionIndexMN_M_Machine_S_CreateShortcut,
+    UIActionIndexMN_M_Machine_S_SortParent,
+    UIActionIndexMN_M_Machine_T_Search,
 
     /* Global Tools actions: */
-    UIActionIndexST_M_Tools_M_Global,
-    UIActionIndexST_M_Tools_M_Global_S_VirtualMediaManager,
-    UIActionIndexST_M_Tools_M_Global_S_HostNetworkManager,
-    UIActionIndexST_M_Tools_M_Global_S_CloudProfileManager,
-    UIActionIndexST_M_Tools_M_Global_S_VMResourceMonitor,
+    UIActionIndexMN_M_Tools_M_Global,
+    UIActionIndexMN_M_Tools_M_Global_S_VirtualMediaManager,
+    UIActionIndexMN_M_Tools_M_Global_S_HostNetworkManager,
+    UIActionIndexMN_M_Tools_M_Global_S_CloudProfileManager,
+    UIActionIndexMN_M_Tools_M_Global_S_VMResourceMonitor,
 
     /* Snapshot Pane actions: */
-    UIActionIndexST_M_Snapshot,
-    UIActionIndexST_M_Snapshot_S_Take,
-    UIActionIndexST_M_Snapshot_S_Delete,
-    UIActionIndexST_M_Snapshot_S_Restore,
-    UIActionIndexST_M_Snapshot_T_Properties,
-    UIActionIndexST_M_Snapshot_S_Clone,
+    UIActionIndexMN_M_Snapshot,
+    UIActionIndexMN_M_Snapshot_S_Take,
+    UIActionIndexMN_M_Snapshot_S_Delete,
+    UIActionIndexMN_M_Snapshot_S_Restore,
+    UIActionIndexMN_M_Snapshot_T_Properties,
+    UIActionIndexMN_M_Snapshot_S_Clone,
 
     /* Virtual Media Manager actions: */
-    UIActionIndexST_M_MediumWindow,
-    UIActionIndexST_M_Medium,
-    UIActionIndexST_M_Medium_S_Add,
-    UIActionIndexST_M_Medium_S_Create,
-    UIActionIndexST_M_Medium_S_Copy,
-    UIActionIndexST_M_Medium_S_Move,
-    UIActionIndexST_M_Medium_S_Remove,
-    UIActionIndexST_M_Medium_S_Release,
-    UIActionIndexST_M_Medium_T_Details,
-    UIActionIndexST_M_Medium_T_Search,
-    UIActionIndexST_M_Medium_S_Refresh,
+    UIActionIndexMN_M_MediumWindow,
+    UIActionIndexMN_M_Medium,
+    UIActionIndexMN_M_Medium_S_Add,
+    UIActionIndexMN_M_Medium_S_Create,
+    UIActionIndexMN_M_Medium_S_Copy,
+    UIActionIndexMN_M_Medium_S_Move,
+    UIActionIndexMN_M_Medium_S_Remove,
+    UIActionIndexMN_M_Medium_S_Release,
+    UIActionIndexMN_M_Medium_T_Details,
+    UIActionIndexMN_M_Medium_T_Search,
+    UIActionIndexMN_M_Medium_S_Refresh,
 
     /* Host Network Manager actions: */
-    UIActionIndexST_M_NetworkWindow,
-    UIActionIndexST_M_Network,
-    UIActionIndexST_M_Network_S_Create,
-    UIActionIndexST_M_Network_S_Remove,
-    UIActionIndexST_M_Network_T_Details,
-    UIActionIndexST_M_Network_S_Refresh,
+    UIActionIndexMN_M_NetworkWindow,
+    UIActionIndexMN_M_Network,
+    UIActionIndexMN_M_Network_S_Create,
+    UIActionIndexMN_M_Network_S_Remove,
+    UIActionIndexMN_M_Network_T_Details,
+    UIActionIndexMN_M_Network_S_Refresh,
 
     /* Cloud Profile Manager actions: */
-    UIActionIndexST_M_CloudWindow,
-    UIActionIndexST_M_Cloud,
-    UIActionIndexST_M_Cloud_S_Add,
-    UIActionIndexST_M_Cloud_S_Import,
-    UIActionIndexST_M_Cloud_S_Remove,
-    UIActionIndexST_M_Cloud_T_Details,
-    UIActionIndexST_M_Cloud_S_TryPage,
-    UIActionIndexST_M_Cloud_S_Help,
+    UIActionIndexMN_M_CloudWindow,
+    UIActionIndexMN_M_Cloud,
+    UIActionIndexMN_M_Cloud_S_Add,
+    UIActionIndexMN_M_Cloud_S_Import,
+    UIActionIndexMN_M_Cloud_S_Remove,
+    UIActionIndexMN_M_Cloud_T_Details,
+    UIActionIndexMN_M_Cloud_S_TryPage,
+    UIActionIndexMN_M_Cloud_S_Help,
 
     /* Cloud Console Manager actions: */
-    UIActionIndexST_M_CloudConsoleWindow,
-    UIActionIndexST_M_CloudConsole,
-    UIActionIndexST_M_CloudConsole_S_ApplicationAdd,
-    UIActionIndexST_M_CloudConsole_S_ApplicationRemove,
-    UIActionIndexST_M_CloudConsole_S_ProfileAdd,
-    UIActionIndexST_M_CloudConsole_S_ProfileRemove,
-    UIActionIndexST_M_CloudConsole_T_Details,
+    UIActionIndexMN_M_CloudConsoleWindow,
+    UIActionIndexMN_M_CloudConsole,
+    UIActionIndexMN_M_CloudConsole_S_ApplicationAdd,
+    UIActionIndexMN_M_CloudConsole_S_ApplicationRemove,
+    UIActionIndexMN_M_CloudConsole_S_ProfileAdd,
+    UIActionIndexMN_M_CloudConsole_S_ProfileRemove,
+    UIActionIndexMN_M_CloudConsole_T_Details,
 
     /* VM resource Monitor actions: */
-    UIActionIndexST_M_VMResourceMonitor,
-    UIActionIndexST_M_VMResourceMonitor_M_Columns,
-    UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance,
+    UIActionIndexMN_M_VMResourceMonitor,
+    UIActionIndexMN_M_VMResourceMonitor_M_Columns,
+    UIActionIndexMN_M_VMResourceMonitor_S_SwitchToMachinePerformance,
 
     /* Maximum index: */
-    UIActionIndexST_Max
+    UIActionIndexMN_Max
 };
 

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

@@ -32 +32 @@
 
 
-/** Runtime action-pool index enum.
+/** VirtualBox Runtime action-pool index enum.
   * Naming convention is following:
   * 1. Every menu index prepended with 'M',

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -205 +205 @@
 QMenu *UIHostNetworkManagerWidget::menu() const
 {
-    return m_pActionPool->action(UIActionIndexST_M_NetworkWindow)->menu();
+    return m_pActionPool->action(UIActionIndexMN_M_NetworkWindow)->menu();
 }
 
@@ -638 +638 @@
 
     /* Update actions availability: */
-    m_pActionPool->action(UIActionIndexST_M_Network_S_Remove)->setEnabled(pItem);
-    m_pActionPool->action(UIActionIndexST_M_Network_T_Details)->setEnabled(pItem);
+    m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove)->setEnabled(pItem);
+    m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->setEnabled(pItem);
 
     /* If there is an item => update details data: */
@@ -658 +658 @@
     if (m_pTreeWidget->itemAt(position))
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details));
     }
     else
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Create));
-//        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Refresh));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create));
+//        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh));
     }
     /* And show it: */
@@ -690 +690 @@
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Create));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Network_T_Details));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Refresh));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh));
 
     /* Connect actions: */
-    connect(m_pActionPool->action(UIActionIndexST_M_Network_S_Create), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create), &QAction::triggered,
             this, &UIHostNetworkManagerWidget::sltCreateHostNetwork);
-    connect(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove), &QAction::triggered,
             this, &UIHostNetworkManagerWidget::sltRemoveHostNetwork);
-    connect(m_pActionPool->action(UIActionIndexST_M_Network_T_Details), &QAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::toggled,
             this, &UIHostNetworkManagerWidget::sltToggleHostNetworkDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Network_S_Refresh), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh), &QAction::triggered,
             this, &UIHostNetworkManagerWidget::sltRefreshHostNetworks);
 }
@@ -742 +742 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Create));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Create));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Remove));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_T_Details));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Remove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details));
 //        m_pToolBar->addSeparator();
-//        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Network_S_Refresh));
+//        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Network_S_Refresh));
 
 #ifdef VBOX_WS_MAC
@@ -785 +785 @@
                 this, &UIHostNetworkManagerWidget::sltHandleItemChange);
         connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
-                m_pActionPool->action(UIActionIndexST_M_Network_T_Details), &QAction::setChecked);
+                m_pActionPool->action(UIActionIndexMN_M_Network_T_Details), &QAction::setChecked);
 
         /* Add into layout: */
@@ -816 +816 @@
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Network_T_Details)->setChecked(gEDataManager->hostNetworkManagerDetailsExpanded());
-    sltToggleHostNetworkDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_Network_T_Details)->isChecked());
+    m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->setChecked(gEDataManager->hostNetworkManagerDetailsExpanded());
+    sltToggleHostNetworkDetailsVisibility(m_pActionPool->action(UIActionIndexMN_M_Network_T_Details)->isChecked());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -674 +674 @@
 
     /* Lock the action preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance), "opened", true);
+    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance), "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
             this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
@@ -700 +700 @@
 
     /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance)
-                                                         << actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI),
+    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance)
+                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI),
                                        "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
@@ -714 +714 @@
     UISafePointerWizard pWizard = new UIWizardExportApp(pWizardParent, names,
                                                         pAction &&
-                                                        pAction == actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI));
+                                                        pAction == actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI));
     windowManager().registerNewParent(pWizard, pWizardParent);
     pWizard->prepare();
@@ -724 +724 @@
 {
     /* Lock the action preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM), "opened", true);
+    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM), "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
             this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
@@ -775 +775 @@
 {
     /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexST_M_Welcome_S_New)
-                                                         << actionPool()->action(UIActionIndexST_M_Machine_S_New)
-                                                         << actionPool()->action(UIActionIndexST_M_Group_S_New),
+    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_New)
+                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_New)
+                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_New),
                                        "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
@@ -836 +836 @@
 {
     /* Lock the actions preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexST_M_Welcome_S_Add)
-                                                         << actionPool()->action(UIActionIndexST_M_Machine_S_Add)
-                                                         << actionPool()->action(UIActionIndexST_M_Group_S_Add),
+    UIQObjectPropertySetter guardBlock(QList<QObject*>() << actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)
+                                                         << actionPool()->action(UIActionIndexMN_M_Machine_S_Add)
+                                                         << actionPool()->action(UIActionIndexMN_M_Group_S_Add),
                                        "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
@@ -884 +884 @@
 {
     /* Lock the action preventing cascade calls: */
-    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), "opened", true);
+    UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings), "opened", true);
     connect(&guardBlock, &UIQObjectPropertySetter::sigAboutToBeDestroyed,
             this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
@@ -1405 +1405 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
-        if (isActionEnabled(UIActionIndexST_M_Group_S_Discard, QList<UIVirtualMachineItem*>() << pItem))
+        if (isActionEnabled(UIActionIndexMN_M_Group_S_Discard, QList<UIVirtualMachineItem*>() << pItem))
         {
             if (pItem->itemType() == UIVirtualMachineItemType_Local)
@@ -1494 +1494 @@
 
         /* Check if current item could be paused/resumed: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_T_Pause, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Group_T_Pause, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -1546 +1546 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
-        if (isActionEnabled(UIActionIndexST_M_Group_S_Reset, QList<UIVirtualMachineItem*>() << pItem))
+        if (isActionEnabled(UIActionIndexMN_M_Group_S_Reset, QList<UIVirtualMachineItem*>() << pItem))
         {
             machineNames << pItem->name();
@@ -1586 +1586 @@
     {
         /* Check if current item could be detached: */
-        if (!isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_Detach, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Detach, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -1605 +1605 @@
         /* Check if current item could be saved: */
         AssertPtrReturnVoid(pItem);
-        if (!isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -1659 +1659 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
-        if (isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_Shutdown, QList<UIVirtualMachineItem*>() << pItem))
+        if (isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, QList<UIVirtualMachineItem*>() << pItem))
         {
             machineNames << pItem->name();
@@ -1725 +1725 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
-        if (isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_PowerOff, QList<UIVirtualMachineItem*>() << pItem))
+        if (isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_PowerOff, QList<UIVirtualMachineItem*>() << pItem))
         {
             machineNames << pItem->name();
@@ -1816 +1816 @@
 
         /* Check if log could be show for the current item: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_S_ShowLogDialog, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Group_S_ShowLogDialog, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -1914 +1914 @@
 
         /* Check if that item could be shown in file-browser: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_S_ShowInFileManager, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Group_S_ShowInFileManager, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -1937 +1937 @@
 
         /* Check if shortcuts could be created for this item: */
-        if (!isActionEnabled(UIActionIndexST_M_Group_S_CreateShortcut, QList<UIVirtualMachineItem*>() << pItem))
+        if (!isActionEnabled(UIActionIndexMN_M_Group_S_CreateShortcut, QList<UIVirtualMachineItem*>() << pItem))
             continue;
 
@@ -2042 +2042 @@
 
     /* Prepare menu update-handlers: */
-    m_menuUpdateHandlers[UIActionIndexST_M_Group] = &UIVirtualBoxManager::updateMenuGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine] = &UIVirtualBoxManager::updateMenuMachine;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuGroupMoveToGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Console] = &UIVirtualBoxManager::updateMenuGroupConsole;
-    m_menuUpdateHandlers[UIActionIndexST_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Console] = &UIVirtualBoxManager::updateMenuMachineConsole;
-    m_menuUpdateHandlers[UIActionIndexST_M_Machine_M_Close] = &UIVirtualBoxManager::updateMenuMachineClose;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group] = &UIVirtualBoxManager::updateMenuGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine] = &UIVirtualBoxManager::updateMenuMachine;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuGroupMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Console] = &UIVirtualBoxManager::updateMenuGroupConsole;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Group_M_Close] = &UIVirtualBoxManager::updateMenuGroupClose;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_MoveToGroup] = &UIVirtualBoxManager::updateMenuMachineMoveToGroup;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Console] = &UIVirtualBoxManager::updateMenuMachineConsole;
+    m_menuUpdateHandlers[UIActionIndexMN_M_Machine_M_Close] = &UIVirtualBoxManager::updateMenuMachineClose;
 
     /* Build menu-bar: */
@@ -2127 +2127 @@
 
     /* 'File' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenVirtualMediumManagerWindow);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenHostNetworkManagerWindow);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenCloudProfileManagerWindow);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenImportApplianceWizardDefault);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenExportApplianceWizard);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenNewCloudVMWizard);
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-    connect(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_ShowExtraDataManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenExtraDataManagerWindow);
 #endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
     connect(actionPool()->action(UIActionIndex_M_Application_S_Preferences), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenPreferencesDialog);
-    connect(actionPool()->action(UIActionIndexST_M_File_S_Close), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_File_S_Close), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformExit);
 
     /* 'Welcome' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_New), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Welcome_S_New), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
-    connect(actionPool()->action(UIActionIndexST_M_Welcome_S_Add), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Welcome_S_Add), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
 
     /* 'Group' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_New), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_New), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Add), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Add), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Rename), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Rename), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenGroupNameEditor);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Remove), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Remove), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltDisbandGroup);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_T_Pause), &UIAction::toggled,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_T_Pause), &UIAction::toggled,
             this, &UIVirtualBoxManager::sltPerformPauseOrResumeMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Reset), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Reset), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformResetMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Discard), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Discard), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDiscardMachineState);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenLogViewerWindow);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Refresh), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformRefreshMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_ShowInFileManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltShowMachineInFileManager);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_CreateShortcut), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateMachineShortcut);
-    connect(actionPool()->action(UIActionIndexST_M_Group_S_Sort), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_S_Sort), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformGroupSorting);
 
     /* 'Machine' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_New), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenNewMachineWizard);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Add), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Add), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenAddMachineDialog);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenMachineSettingsDialogDefault);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Clone), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Clone), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenCloneMachineWizard);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Move), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Move), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformMachineMove);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenExportApplianceWizard);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Remove), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformMachineRemove);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_MoveToGroup_S_New), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformMachineMoveToNewGroup);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartOrShowMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_T_Pause), &UIAction::toggled,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_T_Pause), &UIAction::toggled,
             this, &UIVirtualBoxManager::sltPerformPauseOrResumeMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Reset), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformResetMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Discard), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDiscardMachineState);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenLogViewerWindow);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformRefreshMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltShowMachineInFileManager);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_CreateShortcut), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateMachineShortcut);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformGroupSorting);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_T_Search), &UIAction::toggled,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_T_Search), &UIAction::toggled,
             this, &UIVirtualBoxManager::sltPerformMachineSearchWidgetVisibilityToggling);
     connect(m_pWidget, &UIVirtualBoxManagerWidget::sigMachineSearchWidgetVisibilityChanged,
-            actionPool()->action(UIActionIndexST_M_Machine_T_Search), &QAction::setChecked);
+            actionPool()->action(UIActionIndexMN_M_Machine_T_Search), &QAction::setChecked);
 
     /* 'Group/Start or Show' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineNormal);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineHeadless);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineDetachable);
 
     /* 'Machine/Start or Show' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineNormal);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineHeadless);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformStartMachineDetachable);
 
     /* 'Group/Console' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_CreateConnection), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_CreateConnection), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateConsoleConnectionForGroup);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDeleteConsoleConnectionForGroup);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_ConfigureApplications), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenCloudConsoleManagerWindow);
 
     /* 'Machine/Console' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CreateConnection), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCreateConsoleConnectionForMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDeleteConsoleConnectionForMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCopyCommandSerialUnix);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCopyCommandSerialWindows);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCopyCommandVNCUnix);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformCopyCommandVNCWindows);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltOpenCloudConsoleManagerWindow);
 
     /* 'Group/Close' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Close_S_Detach), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Detach), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDetachMachineUI);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Close_S_SaveState), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_SaveState), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformSaveMachineState);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Close_S_Shutdown), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformShutdownMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Group_M_Close_S_PowerOff), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformPowerOffMachine);
 
     /* 'Machine/Close' menu connections: */
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_Detach), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Detach), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformDetachMachineUI);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_SaveState), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_SaveState), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformSaveMachineState);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_Shutdown), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformShutdownMachine);
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_PowerOff), &UIAction::triggered,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformPowerOffMachine);
 
     /* 'Group/Tools' menu connections: */
-    connect(actionPool()->actionGroup(UIActionIndexST_M_Group_M_Tools), &QActionGroup::triggered,
+    connect(actionPool()->actionGroup(UIActionIndexMN_M_Group_M_Tools), &QActionGroup::triggered,
             this, &UIVirtualBoxManager::sltPerformShowMachineTool);
 
     /* 'Machine/Tools' menu connections: */
-    connect(actionPool()->actionGroup(UIActionIndexST_M_Machine_M_Tools), &QActionGroup::triggered,
+    connect(actionPool()->actionGroup(UIActionIndexMN_M_Machine_M_Tools), &QActionGroup::triggered,
             this, &UIVirtualBoxManager::sltPerformShowMachineTool);
 }
@@ -2620 +2620 @@
     {
         /* Populate Group-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Rename));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Remove));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_MoveToGroup));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Rename));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Remove));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_MoveToGroup));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_T_Pause));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Reset));
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Close)->menu());
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Pause));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
         pMenu->addSeparator();
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Tools)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Tools)->menu());
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowInFileManager));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_CreateShortcut));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Sort));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
     }
     else
     {
         /* Populate Group-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Console)->menu());
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Close)->menu());
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Sort));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
     }
 }
@@ -2670 +2670 @@
     {
         /* Populate Machine-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Clone));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Move));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Remove));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Clone));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Move));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_MoveToGroup));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Pause));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Reset));
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Close)->menu());
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Pause));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
         pMenu->addSeparator();
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Tools)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Tools)->menu());
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_CreateShortcut));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Search));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
     }
     else
     {
         /* Populate Machine-menu: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Remove));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Console)->menu());
-        pMenu->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Close)->menu());
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
+        pMenu->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenu->addSeparator();
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Search));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
     }
 }
@@ -2738 +2738 @@
 {
     /* Populate 'Group' / 'Console' menu: */
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_CreateConnection));
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection));
+    pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_CreateConnection));
+    pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection));
     pMenu->addSeparator();
-    pMenu->addAction(actionPool()->action(UIActionIndexST_M_Group_M_Console_S_ConfigureApplications));
+    pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications));
 }
 
@@ -2750 +2750 @@
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
 
-    actionPool()->action(UIActionIndexST_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close_S_Shutdown, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Shutdown, items));
 }
 
@@ -2788 +2788 @@
     /* Populate 'Group' / 'Console' menu: */
     if (strFingerprint.isEmpty())
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CreateConnection));
     else
     {
@@ -2802 +2802 @@
 
         /* Copy command to clipboard actions: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix));
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows));
         pMenu->addSeparator();
 
@@ -2859 +2859 @@
         }
         /* Terminal application configuration tool: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications));
         pMenu->addSeparator();
 
         /* Delete connection action finally: */
-        pMenu->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection));
+        pMenu->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection));
     }
 }
@@ -2873 +2873 @@
     AssertMsgReturnVoid(!items.isEmpty(), ("At least one item should be selected!\n"));
 
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_Shutdown, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, items));
 }
 
@@ -2882 +2882 @@
     const bool fGroupMenuShown   = m_pWidget->isGroupItemSelected()   &&  isSingleGroupSelected();
     const bool fMachineMenuShown = m_pWidget->isMachineItemSelected() && !isSingleGroupSelected();
-    actionPool()->action(UIActionIndexST_M_Welcome)->setVisible(fGlobalMenuShown);
-    actionPool()->action(UIActionIndexST_M_Group)->setVisible(fGroupMenuShown);
-    actionPool()->action(UIActionIndexST_M_Machine)->setVisible(fMachineMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Welcome)->setVisible(fGlobalMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Group)->setVisible(fGroupMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Machine)->setVisible(fMachineMenuShown);
 
     /* Determine whether Media menu should be visible: */
     const bool fMediumMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Media;
-    actionPool()->action(UIActionIndexST_M_Medium)->setVisible(fMediumMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Medium)->setVisible(fMediumMenuShown);
     /* Determine whether Network menu should be visible: */
     const bool fNetworkMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Network;
-    actionPool()->action(UIActionIndexST_M_Network)->setVisible(fNetworkMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Network)->setVisible(fNetworkMenuShown);
     /* Determine whether Cloud menu should be visible: */
     const bool fCloudMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Cloud;
-    actionPool()->action(UIActionIndexST_M_Cloud)->setVisible(fCloudMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Cloud)->setVisible(fCloudMenuShown);
     /* Determine whether Resources menu should be visible: */
     const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Resources;
-    actionPool()->action(UIActionIndexST_M_VMResourceMonitor)->setVisible(fResourcesMenuShown);
+    actionPool()->action(UIActionIndexMN_M_VMResourceMonitor)->setVisible(fResourcesMenuShown);
 
     /* Determine whether Snapshots menu should be visible: */
     const bool fSnapshotMenuShown = (fMachineMenuShown || fGroupMenuShown) &&
                                     m_pWidget->currentMachineTool() == UIToolType_Snapshots;
-    actionPool()->action(UIActionIndexST_M_Snapshot)->setVisible(fSnapshotMenuShown);
+    actionPool()->action(UIActionIndexMN_M_Snapshot)->setVisible(fSnapshotMenuShown);
     /* Determine whether Logs menu should be visible: */
     const bool fLogViewerMenuShown = (fMachineMenuShown || fGroupMenuShown) &&
@@ -2914 +2914 @@
     /* Hide action shortcuts: */
     if (!fGlobalMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Welcome, false);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Welcome, false);
     if (!fGroupMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Group, false);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Group, false);
     if (!fMachineMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Machine, false);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Machine, false);
 
     /* Show action shortcuts: */
     if (fGlobalMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Welcome, true);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Welcome, true);
     if (fGroupMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Group, true);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Group, true);
     if (fMachineMenuShown)
-        actionPool()->setShortcutsVisible(UIActionIndexST_M_Machine, true);
+        actionPool()->setShortcutsVisible(UIActionIndexMN_M_Machine, true);
 }
 
@@ -2936 +2936 @@
     /* Enable/disable File/Application actions: */
     actionPool()->action(UIActionIndex_M_Application_S_Preferences)->setEnabled(isActionEnabled(UIActionIndex_M_Application_S_Preferences, items));
-    actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance)->setEnabled(isActionEnabled(UIActionIndexST_M_File_S_ExportAppliance, items));
-    actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance)->setEnabled(isActionEnabled(UIActionIndexST_M_File_S_ImportAppliance, items));
-    actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM)->setEnabled(isActionEnabled(UIActionIndexST_M_File_S_NewCloudVM, items));
+    actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance)->setEnabled(isActionEnabled(UIActionIndexMN_M_File_S_ExportAppliance, items));
+    actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance)->setEnabled(isActionEnabled(UIActionIndexMN_M_File_S_ImportAppliance, items));
+    actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM)->setEnabled(isActionEnabled(UIActionIndexMN_M_File_S_NewCloudVM, items));
 
     /* Enable/disable welcome actions: */
-    actionPool()->action(UIActionIndexST_M_Welcome_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Welcome_S_New, items));
-    actionPool()->action(UIActionIndexST_M_Welcome_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Welcome_S_Add, items));
+    actionPool()->action(UIActionIndexMN_M_Welcome_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Welcome_S_New, items));
+    actionPool()->action(UIActionIndexMN_M_Welcome_S_Add)->setEnabled(isActionEnabled(UIActionIndexMN_M_Welcome_S_Add, items));
 
     /* Enable/disable group actions: */
-    actionPool()->action(UIActionIndexST_M_Group_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_New, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Add, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Rename)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Rename, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Remove, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_MoveToGroup, items));
-    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_T_Pause, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Reset, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Discard)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Discard, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_ShowLogDialog, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Refresh, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_ShowInFileManager, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_CreateShortcut, items));
-    actionPool()->action(UIActionIndexST_M_Group_S_Sort)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_S_Sort, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_New, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Add)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Add, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Rename)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Rename, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Remove)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Remove, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_MoveToGroup, items));
+    actionPool()->action(UIActionIndexMN_M_Group_T_Pause)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_T_Pause, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Reset)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Reset, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Discard, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_ShowLogDialog, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Refresh, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_ShowInFileManager, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_CreateShortcut)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_CreateShortcut, items));
+    actionPool()->action(UIActionIndexMN_M_Group_S_Sort)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_S_Sort, items));
 
     /* Enable/disable machine actions: */
-    actionPool()->action(UIActionIndexST_M_Machine_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_New, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Add)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Add, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Settings)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Settings, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Clone)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Clone, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Move)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Move, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ExportToOCI, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Remove)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Remove, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_MoveToGroup, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup_S_New)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_MoveToGroup_S_New, items));
-    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_T_Pause, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Reset)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Reset, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Discard)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Discard, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ShowLogDialog, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_Refresh, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_ShowInFileManager, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_CreateShortcut, items));
-    actionPool()->action(UIActionIndexST_M_Machine_S_SortParent)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_S_SortParent, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_New, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Add)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Add, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Settings)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Settings, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Clone)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Clone, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Move)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Move, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_ExportToOCI, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Remove)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Remove, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_MoveToGroup)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_MoveToGroup, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_MoveToGroup_S_New)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_MoveToGroup_S_New, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_T_Pause)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_T_Pause, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Reset)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Reset, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Discard, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_ShowLogDialog, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_Refresh, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_ShowInFileManager, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_CreateShortcut)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_CreateShortcut, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_S_SortParent, items));
 
     /* Enable/disable group-start-or-show actions: */
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_StartOrShow, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable, items));
 
     /* Enable/disable machine-start-or-show actions: */
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_StartOrShow, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable, items));
 
     /* Enable/disable group-console actions: */
-    actionPool()->action(UIActionIndexST_M_Group_M_Console)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Console, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Console_S_CreateConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Console_S_CreateConnection, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Console_S_DeleteConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Console_S_DeleteConnection, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Console_S_ConfigureApplications)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Console_S_ConfigureApplications, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Console)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Console, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_CreateConnection)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Console_S_CreateConnection, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Console_S_DeleteConnection, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications, items));
 
     /* Enable/disable machine-console actions: */
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CreateConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CreateConnection, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_DeleteConnection, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CreateConnection)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_CreateConnection, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications, items));
 
     /* Enable/disable group-close actions: */
-    actionPool()->action(UIActionIndexST_M_Group_M_Close)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Close_S_Detach)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close_S_Detach, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close_S_SaveState, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close_S_Shutdown, items));
-    actionPool()->action(UIActionIndexST_M_Group_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexST_M_Group_M_Close_S_PowerOff, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Detach)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Detach, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_SaveState, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_Shutdown, items));
+    actionPool()->action(UIActionIndexMN_M_Group_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Group_M_Close_S_PowerOff, items));
 
     /* Enable/disable machine-close actions: */
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_Detach)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_Detach, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_SaveState, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_Shutdown, items));
-    actionPool()->action(UIActionIndexST_M_Machine_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_PowerOff, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Detach)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Detach, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_SaveState)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_SaveState, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_Shutdown)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_Shutdown, items));
+    actionPool()->action(UIActionIndexMN_M_Machine_M_Close_S_PowerOff)->setEnabled(isActionEnabled(UIActionIndexMN_M_Machine_M_Close_S_PowerOff, items));
 
     /* Get current item: */
@@ -3028 +3028 @@
             || pItem->itemType() == UIVirtualMachineItemType_CloudReal))
     {
-        actionPool()->action(UIActionIndexST_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(1);
-        actionPool()->action(UIActionIndexST_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(1);
+        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(1);
+        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(1);
     }
     else
     {
-        actionPool()->action(UIActionIndexST_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(0);
-        actionPool()->action(UIActionIndexST_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Group_S_Discard)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Machine_S_Discard)->toActionPolymorphicMenu()->setState(0);
     }
 
@@ -3040 +3040 @@
     if (pItem && pItem->accessible())
     {
-        actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
-        actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
+        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
+        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(pItem->isItemPoweredOff() ? 0 : 1);
         /// @todo Hmm, fix it?
-//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)));
+//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
 //        if (pButton)
 //            pButton->setPopupMode(pItem->isItemPoweredOff() ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
@@ -3049 +3049 @@
     else
     {
-        actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
-        actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
+        actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)->toActionPolymorphicMenu()->setState(0);
         /// @todo Hmm, fix it?
-//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow)));
+//        QToolButton *pButton = qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow)));
 //        if (pButton)
 //            pButton->setPopupMode(pItem->isItemPoweredOff() ? QToolButton::MenuButtonPopup : QToolButton::DelayedPopup);
@@ -3068 +3068 @@
     }
     /* Update the group Pause/Resume action appearance: */
-    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->blockSignals(true);
-    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->setChecked(pFirstStartedAction && pFirstStartedAction->isItemPaused());
-    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->retranslateUi();
-    actionPool()->action(UIActionIndexST_M_Group_T_Pause)->blockSignals(false);
+    actionPool()->action(UIActionIndexMN_M_Group_T_Pause)->blockSignals(true);
+    actionPool()->action(UIActionIndexMN_M_Group_T_Pause)->setChecked(pFirstStartedAction && pFirstStartedAction->isItemPaused());
+    actionPool()->action(UIActionIndexMN_M_Group_T_Pause)->retranslateUi();
+    actionPool()->action(UIActionIndexMN_M_Group_T_Pause)->blockSignals(false);
     /* Update the machine Pause/Resume action appearance: */
-    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(true);
-    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->setChecked(pFirstStartedAction && pFirstStartedAction->isItemPaused());
-    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->retranslateUi();
-    actionPool()->action(UIActionIndexST_M_Machine_T_Pause)->blockSignals(false);
+    actionPool()->action(UIActionIndexMN_M_Machine_T_Pause)->blockSignals(true);
+    actionPool()->action(UIActionIndexMN_M_Machine_T_Pause)->setChecked(pFirstStartedAction && pFirstStartedAction->isItemPaused());
+    actionPool()->action(UIActionIndexMN_M_Machine_T_Pause)->retranslateUi();
+    actionPool()->action(UIActionIndexMN_M_Machine_T_Pause)->blockSignals(false);
 
     /* Update action toggle states: */
@@ -3085 +3085 @@
             case UIToolType_Details:
             {
-                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Details)->setChecked(true);
-                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Details)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Details)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Details)->setChecked(true);
                 break;
             }
             case UIToolType_Snapshots:
             {
-                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Snapshots)->setChecked(true);
-                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Snapshots)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Snapshots)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Snapshots)->setChecked(true);
                 break;
             }
             case UIToolType_Logs:
             {
-                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Logs)->setChecked(true);
-                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Logs)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Logs)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Logs)->setChecked(true);
                 break;
             }
             case UIToolType_Performance:
             {
-                actionPool()->action(UIActionIndexST_M_Group_M_Tools_T_Performance)->setChecked(true);
-                actionPool()->action(UIActionIndexST_M_Machine_M_Tools_T_Performance)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Group_M_Tools_T_Performance)->setChecked(true);
+                actionPool()->action(UIActionIndexMN_M_Machine_M_Tools_T_Performance)->setChecked(true);
                 break;
             }
@@ -3127 +3127 @@
     {
         case UIActionIndex_M_Application_S_Preferences:
-        case UIActionIndexST_M_File_S_ExportAppliance:
-        case UIActionIndexST_M_File_S_ImportAppliance:
-        case UIActionIndexST_M_File_S_NewCloudVM:
-        case UIActionIndexST_M_Welcome_S_New:
-        case UIActionIndexST_M_Welcome_S_Add:
+        case UIActionIndexMN_M_File_S_ExportAppliance:
+        case UIActionIndexMN_M_File_S_ImportAppliance:
+        case UIActionIndexMN_M_File_S_NewCloudVM:
+        case UIActionIndexMN_M_Welcome_S_New:
+        case UIActionIndexMN_M_Welcome_S_Add:
             return true;
         default:
@@ -3147 +3147 @@
     switch (iActionIndex)
     {
-        case UIActionIndexST_M_Group_S_New:
-        case UIActionIndexST_M_Group_S_Add:
+        case UIActionIndexMN_M_Group_S_New:
+        case UIActionIndexMN_M_Group_S_Add:
         {
             return !isGroupSavingInProgress() &&
@@ -3154 +3154 @@
                     isSingleCloudProfileGroupSelected());
         }
-        case UIActionIndexST_M_Group_S_Sort:
+        case UIActionIndexMN_M_Group_S_Sort:
         {
             return !isGroupSavingInProgress() &&
@@ -3160 +3160 @@
                    isItemsLocal(items);
         }
-        case UIActionIndexST_M_Group_S_Rename:
-        case UIActionIndexST_M_Group_S_Remove:
+        case UIActionIndexMN_M_Group_S_Rename:
+        case UIActionIndexMN_M_Group_S_Remove:
         {
             return !isGroupSavingInProgress() &&
@@ -3168 +3168 @@
                    isItemsPoweredOff(items);
         }
-        case UIActionIndexST_M_Machine_S_New:
-        case UIActionIndexST_M_Machine_S_Add:
+        case UIActionIndexMN_M_Machine_S_New:
+        case UIActionIndexMN_M_Machine_S_Add:
         {
             return !isGroupSavingInProgress();
         }
-        case UIActionIndexST_M_Machine_S_Settings:
+        case UIActionIndexMN_M_Machine_S_Settings:
         {
             return !isGroupSavingInProgress() &&
@@ -3181 +3181 @@
                     m_pWidget->isCurrentStateItemSelected());
         }
-        case UIActionIndexST_M_Machine_S_Clone:
-        case UIActionIndexST_M_Machine_S_Move:
+        case UIActionIndexMN_M_Machine_S_Clone:
+        case UIActionIndexMN_M_Machine_S_Move:
         {
             return !isGroupSavingInProgress() &&
@@ -3189 +3189 @@
                    pItem->isItemEditable();
         }
-        case UIActionIndexST_M_Machine_S_ExportToOCI:
+        case UIActionIndexMN_M_Machine_S_ExportToOCI:
         {
             return items.size() == 1 &&
                    pItem->toLocal();
         }
-        case UIActionIndexST_M_Machine_S_Remove:
+        case UIActionIndexMN_M_Machine_S_Remove:
         {
             return !isGroupSavingInProgress() &&
                    isAtLeastOneItemRemovable(items);
         }
-        case UIActionIndexST_M_Group_M_MoveToGroup:
-        case UIActionIndexST_M_Machine_M_MoveToGroup:
-        case UIActionIndexST_M_Machine_M_MoveToGroup_S_New:
+        case UIActionIndexMN_M_Group_M_MoveToGroup:
+        case UIActionIndexMN_M_Machine_M_MoveToGroup:
+        case UIActionIndexMN_M_Machine_M_MoveToGroup_S_New:
         {
             return !isGroupSavingInProgress() &&
@@ -3207 +3207 @@
                    isItemsPoweredOff(items);
         }
-        case UIActionIndexST_M_Group_M_StartOrShow:
-        case UIActionIndexST_M_Group_M_StartOrShow_S_StartNormal:
-        case UIActionIndexST_M_Machine_M_StartOrShow:
-        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartNormal:
+        case UIActionIndexMN_M_Group_M_StartOrShow:
+        case UIActionIndexMN_M_Group_M_StartOrShow_S_StartNormal:
+        case UIActionIndexMN_M_Machine_M_StartOrShow:
+        case UIActionIndexMN_M_Machine_M_StartOrShow_S_StartNormal:
         {
             return !isGroupSavingInProgress() &&
@@ -3217 +3217 @@
                      m_pWidget->isCurrentStateItemSelected());
         }
-        case UIActionIndexST_M_Group_M_StartOrShow_S_StartHeadless:
-        case UIActionIndexST_M_Group_M_StartOrShow_S_StartDetachable:
-        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartHeadless:
-        case UIActionIndexST_M_Machine_M_StartOrShow_S_StartDetachable:
+        case UIActionIndexMN_M_Group_M_StartOrShow_S_StartHeadless:
+        case UIActionIndexMN_M_Group_M_StartOrShow_S_StartDetachable:
+        case UIActionIndexMN_M_Machine_M_StartOrShow_S_StartHeadless:
+        case UIActionIndexMN_M_Machine_M_StartOrShow_S_StartDetachable:
         {
             return !isGroupSavingInProgress() &&
@@ -3228 +3228 @@
                      m_pWidget->isCurrentStateItemSelected());
         }
-        case UIActionIndexST_M_Group_S_Discard:
-        case UIActionIndexST_M_Machine_S_Discard:
+        case UIActionIndexMN_M_Group_S_Discard:
+        case UIActionIndexMN_M_Machine_S_Discard:
         {
             return !isGroupSavingInProgress() &&
@@ -3236 +3236 @@
                      m_pWidget->isCurrentStateItemSelected());
         }
-        case UIActionIndexST_M_Group_S_ShowLogDialog:
-        case UIActionIndexST_M_Machine_S_ShowLogDialog:
+        case UIActionIndexMN_M_Group_S_ShowLogDialog:
+        case UIActionIndexMN_M_Machine_S_ShowLogDialog:
         {
             return isItemsLocal(items) &&
                    isAtLeastOneItemAccessible(items);
         }
-        case UIActionIndexST_M_Group_T_Pause:
-        case UIActionIndexST_M_Machine_T_Pause:
+        case UIActionIndexMN_M_Group_T_Pause:
+        case UIActionIndexMN_M_Machine_T_Pause:
         {
             return isItemsLocal(items) &&
                    isAtLeastOneItemStarted(items);
         }
-        case UIActionIndexST_M_Group_S_Reset:
-        case UIActionIndexST_M_Machine_S_Reset:
+        case UIActionIndexMN_M_Group_S_Reset:
+        case UIActionIndexMN_M_Machine_S_Reset:
         {
             return isItemsLocal(items) &&
                    isAtLeastOneItemRunning(items);
         }
-        case UIActionIndexST_M_Group_S_Refresh:
-        case UIActionIndexST_M_Machine_S_Refresh:
+        case UIActionIndexMN_M_Group_S_Refresh:
+        case UIActionIndexMN_M_Machine_S_Refresh:
         {
             return isAtLeastOneItemInaccessible(items);
         }
-        case UIActionIndexST_M_Group_S_ShowInFileManager:
-        case UIActionIndexST_M_Machine_S_ShowInFileManager:
+        case UIActionIndexMN_M_Group_S_ShowInFileManager:
+        case UIActionIndexMN_M_Machine_S_ShowInFileManager:
         {
             return isItemsLocal(items) &&
                    isAtLeastOneItemAccessible(items);
         }
-        case UIActionIndexST_M_Machine_S_SortParent:
+        case UIActionIndexMN_M_Machine_S_SortParent:
         {
             return !isGroupSavingInProgress() &&
                    isItemsLocal(items);
         }
-        case UIActionIndexST_M_Group_S_CreateShortcut:
-        case UIActionIndexST_M_Machine_S_CreateShortcut:
+        case UIActionIndexMN_M_Group_S_CreateShortcut:
+        case UIActionIndexMN_M_Machine_S_CreateShortcut:
         {
             return isAtLeastOneItemSupportsShortcuts(items);
         }
-        case UIActionIndexST_M_Group_M_Console:
-        case UIActionIndexST_M_Group_M_Console_S_CreateConnection:
-        case UIActionIndexST_M_Group_M_Console_S_DeleteConnection:
-        case UIActionIndexST_M_Group_M_Console_S_ConfigureApplications:
-        case UIActionIndexST_M_Machine_M_Console:
-        case UIActionIndexST_M_Machine_M_Console_S_CreateConnection:
-        case UIActionIndexST_M_Machine_M_Console_S_DeleteConnection:
-        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialUnix:
-        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandSerialWindows:
-        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCUnix:
-        case UIActionIndexST_M_Machine_M_Console_S_CopyCommandVNCWindows:
-        case UIActionIndexST_M_Machine_M_Console_S_ConfigureApplications:
+        case UIActionIndexMN_M_Group_M_Console:
+        case UIActionIndexMN_M_Group_M_Console_S_CreateConnection:
+        case UIActionIndexMN_M_Group_M_Console_S_DeleteConnection:
+        case UIActionIndexMN_M_Group_M_Console_S_ConfigureApplications:
+        case UIActionIndexMN_M_Machine_M_Console:
+        case UIActionIndexMN_M_Machine_M_Console_S_CreateConnection:
+        case UIActionIndexMN_M_Machine_M_Console_S_DeleteConnection:
+        case UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialUnix:
+        case UIActionIndexMN_M_Machine_M_Console_S_CopyCommandSerialWindows:
+        case UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCUnix:
+        case UIActionIndexMN_M_Machine_M_Console_S_CopyCommandVNCWindows:
+        case UIActionIndexMN_M_Machine_M_Console_S_ConfigureApplications:
         {
             return isAtLeastOneItemStarted(items);
         }
-        case UIActionIndexST_M_Group_M_Close:
-        case UIActionIndexST_M_Machine_M_Close:
+        case UIActionIndexMN_M_Group_M_Close:
+        case UIActionIndexMN_M_Machine_M_Close:
         {
             return isAtLeastOneItemStarted(items);
         }
-        case UIActionIndexST_M_Group_M_Close_S_Detach:
-        case UIActionIndexST_M_Machine_M_Close_S_Detach:
+        case UIActionIndexMN_M_Group_M_Close_S_Detach:
+        case UIActionIndexMN_M_Machine_M_Close_S_Detach:
         {
             return isItemsLocal(items) &&
-                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
-        }
-        case UIActionIndexST_M_Group_M_Close_S_SaveState:
-        case UIActionIndexST_M_Machine_M_Close_S_SaveState:
+                   isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items);
+        }
+        case UIActionIndexMN_M_Group_M_Close_S_SaveState:
+        case UIActionIndexMN_M_Machine_M_Close_S_SaveState:
         {
             return isItemsLocal(items) &&
-                   isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
-        }
-        case UIActionIndexST_M_Group_M_Close_S_Shutdown:
-        case UIActionIndexST_M_Machine_M_Close_S_Shutdown:
-        {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items) &&
+                   isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items);
+        }
+        case UIActionIndexMN_M_Group_M_Close_S_Shutdown:
+        case UIActionIndexMN_M_Machine_M_Close_S_Shutdown:
+        {
+            return isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items) &&
                    isAtLeastOneItemAbleToShutdown(items);
         }
-        case UIActionIndexST_M_Group_M_Close_S_PowerOff:
-        case UIActionIndexST_M_Machine_M_Close_S_PowerOff:
-        {
-            return isActionEnabled(UIActionIndexST_M_Machine_M_Close, items);
+        case UIActionIndexMN_M_Group_M_Close_S_PowerOff:
+        case UIActionIndexMN_M_Machine_M_Close_S_PowerOff:
+        {
+            return isActionEnabled(UIActionIndexMN_M_Machine_M_Close, items);
         }
         default:

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -735 +735 @@
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
-                    //m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM)); // later
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
+                    //m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM)); // later
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_New));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Welcome_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_New));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Welcome_S_Add));
                     break;
                 }
                 case UIToolType_Media:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Add));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Create));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Create));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Copy));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Move));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Remove));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Release));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_T_Search));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_T_Details));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Copy));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Move));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Remove));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Release));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Search));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_T_Details));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Medium_S_Refresh));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Medium_S_Refresh));
                     break;
                 }
                 case UIToolType_Network:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Create));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Create));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Remove));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_T_Details));
-                    //m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Network_S_Refresh));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Remove));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_T_Details));
+                    //m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Network_S_Refresh));
                     break;
                 }
                 case UIToolType_Cloud:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Add));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Import));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Import));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Remove));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_T_Details));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Remove));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_T_Details));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_TryPage));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Cloud_S_Help));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_TryPage));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Cloud_S_Help));
                     break;
                 }
                 case UIToolType_Resources:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_VMResourceMonitor_M_Columns));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMResourceMonitor_M_Columns));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_VMResourceMonitor_S_SwitchToMachinePerformance));
                     QToolButton *pButton =
-                        qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexST_M_VMResourceMonitor_M_Columns)));
+                        qobject_cast<QToolButton*>(m_pToolBar->widgetForAction(actionPool()->action(UIActionIndexMN_M_VMResourceMonitor_M_Columns)));
                     if (pButton)
                     {
@@ -807 +807 @@
                     if (isSingleGroupSelected())
                     {
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
                         m_pToolBar->addSeparator();
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
                     }
                     else
                     {
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
                         m_pToolBar->addSeparator();
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-                        m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+                        m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
                     }
                     break;
@@ -826 +826 @@
                 case UIToolType_Snapshots:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Take));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Delete));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Restore));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_T_Properties));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Snapshot_S_Clone));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Snapshot_S_Take));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Snapshot_S_Delete));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Snapshot_S_Restore));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Snapshot_T_Properties));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Snapshot_S_Clone));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
                     break;
                 }
@@ -846 +846 @@
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Log_S_Refresh));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
                     break;
                 }
@@ -855 +855 @@
                     m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_Performance_S_Export));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
                     break;
                 }
                 case UIToolType_Error:
                 {
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_New));
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Add));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_New));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Add));
                     m_pToolBar->addSeparator();
-                    m_pToolBar->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh));
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
                     break;
                 }
@@ -881 +881 @@
     // Actually Qt should do that itself but by some unknown reason it sometimes
     // forget to update toolbar after changing its actions on Cocoa platform.
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_New), &UIAction::changed,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_New), &UIAction::changed,
             m_pToolBar, static_cast<void(UIToolBar::*)(void)>(&UIToolBar::update));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), &UIAction::changed,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings), &UIAction::changed,
             m_pToolBar, static_cast<void(UIToolBar::*)(void)>(&UIToolBar::update));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_S_Discard), &UIAction::changed,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard), &UIAction::changed,
             m_pToolBar, static_cast<void(UIToolBar::*)(void)>(&UIToolBar::update));
-    connect(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow), &UIAction::changed,
+    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow), &UIAction::changed,
             m_pToolBar, static_cast<void(UIToolBar::*)(void)>(&UIToolBar::update));
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1265 +1265 @@
         pMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
         pMenuGlobal->addSeparator();
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM));
 # ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowExtraDataManager));
 # endif
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
         if (fExtPackAccessible)
-            pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+            pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 
 #else /* !VBOX_WS_MAC */
@@ -1280 +1280 @@
         pMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_Preferences));
         pMenuGlobal->addSeparator();
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ImportAppliance));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ExportAppliance));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_NewCloudVM));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ImportAppliance));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ExportAppliance));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_NewCloudVM));
         pMenuGlobal->addSeparator();
 # ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowExtraDataManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowExtraDataManager));
 # endif
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowVirtualMediumManager));
-        pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowVirtualMediumManager));
+        pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowHostNetworkManager));
         if (fExtPackAccessible)
-            pMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
+            pMenuGlobal->addAction(actionPool()->action(UIActionIndexMN_M_File_S_ShowCloudProfileManager));
 # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         pMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -1303 +1303 @@
     if (QMenu *pMenuGroup = m_localMenus.value(UIChooserNodeType_Group))
     {
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Rename));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Remove));
-        pMenuGroup->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_MoveToGroup)->menu());
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Rename));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Remove));
+        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_MoveToGroup)->menu());
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_T_Pause));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Reset));
-        pMenuGroup->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Close)->menu());
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_T_Pause));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Reset));
+        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowLogDialog));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowLogDialog));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_ShowInFileManager));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_CreateShortcut));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_ShowInFileManager));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_CreateShortcut));
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Sort));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
     }
 
@@ -1329 +1329 @@
     if (QMenu *pMenuMachine = m_localMenus.value(UIChooserNodeType_Machine))
     {
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Clone));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Move));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ExportToOCI));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Remove));
-        pMenuMachine->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_MoveToGroup)->menu());
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Clone));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Move));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ExportToOCI));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
+        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_MoveToGroup)->menu());
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Pause));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Reset));
-        pMenuMachine->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Close)->menu());
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Pause));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Reset));
+        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowLogDialog));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowLogDialog));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_ShowInFileManager));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_CreateShortcut));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_ShowInFileManager));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_CreateShortcut));
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Search));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
     }
 
@@ -1356 +1356 @@
     if (QMenu *pMenuGroup = m_cloudMenus.value(UIChooserNodeType_Group))
     {
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_New));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Add));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_New));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Add));
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_M_StartOrShow));
-        pMenuGroup->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Console)->menu());
-        pMenuGroup->addMenu(actionPool()->action(UIActionIndexST_M_Group_M_Close)->menu());
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_M_StartOrShow));
+        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Console)->menu());
+        pMenuGroup->addMenu(actionPool()->action(UIActionIndexMN_M_Group_M_Close)->menu());
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Discard));
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Refresh));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Discard));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Refresh));
         pMenuGroup->addSeparator();
-        pMenuGroup->addAction(actionPool()->action(UIActionIndexST_M_Group_S_Sort));
+        pMenuGroup->addAction(actionPool()->action(UIActionIndexMN_M_Group_S_Sort));
     }
 
@@ -1373 +1373 @@
     if (QMenu *pMenuMachine = m_cloudMenus.value(UIChooserNodeType_Machine))
     {
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Settings));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Remove));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Remove));
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_M_StartOrShow));
-        pMenuMachine->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Console)->menu());
-        pMenuMachine->addMenu(actionPool()->action(UIActionIndexST_M_Machine_M_Close)->menu());
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow));
+        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Console)->menu());
+        pMenuMachine->addMenu(actionPool()->action(UIActionIndexMN_M_Machine_M_Close)->menu());
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Discard));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_Refresh));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_Refresh));
         pMenuMachine->addSeparator();
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_S_SortParent));
-        pMenuMachine->addAction(actionPool()->action(UIActionIndexST_M_Machine_T_Search));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_S_SortParent));
+        pMenuMachine->addAction(actionPool()->action(UIActionIndexMN_M_Machine_T_Search));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -171 +171 @@
 QMenu *UIMediumManagerWidget::menu() const
 {
-    return m_pActionPool->action(UIActionIndexST_M_MediumWindow)->menu();
+    return m_pActionPool->action(UIActionIndexMN_M_MediumWindow)->menu();
 }
 
@@ -393 +393 @@
 {
     /* Disable 'refresh' action: */
-    if (m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh))
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh)->setEnabled(false);
+    if (m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh))
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh)->setEnabled(false);
 
     /* Disable details-widget: */
@@ -462 +462 @@
 
     /* Enable 'refresh' action: */
-    if (m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh))
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh)->setEnabled(true);
+    if (m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh))
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh)->setEnabled(true);
 
     /* Re-fetch all current medium-items: */
@@ -631 +631 @@
     if (pTreeWidget->itemAt(position))
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details));
     }
     else
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Add));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Create));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh));
     }
     /* And show it: */
@@ -733 +733 @@
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Add));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Create));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh));
 
     /* Connect actions: */
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Add), &QAction::triggered,
             this, &UIMediumManagerWidget::sltAddMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Create), &QAction::triggered,
             this, &UIMediumManagerWidget::sltCreateMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy), &QAction::triggered,
             this, &UIMediumManagerWidget::sltCopyMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move), &QAction::triggered,
             this, &UIMediumManagerWidget::sltMoveMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove), &QAction::triggered,
             this, &UIMediumManagerWidget::sltRemoveMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release), &QAction::triggered,
             this, &UIMediumManagerWidget::sltReleaseMedium);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details), &QAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details), &QAction::toggled,
             this, &UIMediumManagerWidget::sltToggleMediumDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search), &QAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search), &QAction::toggled,
             this, &UIMediumManagerWidget::sltToggleMediumSearchVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh), &QAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh), &QAction::triggered,
             this, &UIMediumManagerWidget::sltRefreshAll);
 
@@ -805 +805 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Add));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Create));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Add));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Create));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Move));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Release));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Medium_S_Refresh));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Medium_S_Refresh));
 
 #ifdef VBOX_WS_MAC
@@ -904 +904 @@
                 this, &UIMediumManagerWidget::sltHandleCurrentItemChanged);
         connect(pTreeWidget, &QITreeWidget::itemDoubleClicked,
-                m_pActionPool->action(UIActionIndexST_M_Medium_T_Details), &QAction::setChecked);
+                m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details), &QAction::setChecked);
         connect(pTreeWidget, &QITreeWidget::customContextMenuRequested,
                 this, &UIMediumManagerWidget::sltHandleContextMenuRequest);
@@ -958 +958 @@
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Medium_T_Details)->setChecked(gEDataManager->virtualMediaManagerDetailsExpanded());
-    sltToggleMediumDetailsVisibility(m_pActionPool->action(UIActionIndexST_M_Medium_T_Details)->isChecked());
+    m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details)->setChecked(gEDataManager->virtualMediaManagerDetailsExpanded());
+    sltToggleMediumDetailsVisibility(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details)->isChecked());
 
     /* Search action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Medium_T_Search)->setChecked(gEDataManager->virtualMediaManagerSearchWidgetExpanded());
-    sltToggleMediumSearchVisibility(m_pActionPool->action(UIActionIndexST_M_Medium_T_Search)->isChecked());
+    m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search)->setChecked(gEDataManager->virtualMediaManagerSearchWidgetExpanded());
+    sltToggleMediumSearchVisibility(m_pActionPool->action(UIActionIndexMN_M_Medium_T_Search)->isChecked());
 }
 
@@ -1065 +1065 @@
     /* Apply actions accessibility: */
     bool fActionEnabledCopy = fNotInEnumeration && pMediumItem && checkMediumFor(pMediumItem, Action_Copy);
-    m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy)->setEnabled(fActionEnabledCopy);
+    m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy)->setEnabled(fActionEnabledCopy);
     bool fActionEnabledMove = fNotInEnumeration && pMediumItem && checkMediumFor(pMediumItem, Action_Edit);
-    m_pActionPool->action(UIActionIndexST_M_Medium_S_Move)->setEnabled(fActionEnabledMove);
+    m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move)->setEnabled(fActionEnabledMove);
     bool fActionEnabledRemove = fNotInEnumeration && pMediumItem && checkMediumFor(pMediumItem, Action_Remove);
-    m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove)->setEnabled(fActionEnabledRemove);
+    m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove)->setEnabled(fActionEnabledRemove);
     bool fActionEnabledRelease = fNotInEnumeration && pMediumItem && checkMediumFor(pMediumItem, Action_Release);
-    m_pActionPool->action(UIActionIndexST_M_Medium_S_Release)->setEnabled(fActionEnabledRelease);
+    m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release)->setEnabled(fActionEnabledRelease);
     bool fActionEnabledDetails = true;
-    m_pActionPool->action(UIActionIndexST_M_Medium_T_Details)->setEnabled(fActionEnabledDetails);
+    m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details)->setEnabled(fActionEnabledDetails);
 }
 
@@ -1081 +1081 @@
     if (enmCurrentMediumType != UIMediumDeviceType_Invalid)
     {
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Add)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Create)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Copy)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Move)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Remove)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_S_Release)->setState((int)enmCurrentMediumType);
-        m_pActionPool->action(UIActionIndexST_M_Medium_T_Details)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Add)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Create)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Copy)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Move)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Remove)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_S_Release)->setState((int)enmCurrentMediumType);
+        m_pActionPool->action(UIActionIndexMN_M_Medium_T_Details)->setState((int)enmCurrentMediumType);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -1418 +1418 @@
 void UIResourceMonitorWidget::updateColumnsMenu()
 {
-    UIMenu *pMenu = m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_M_Columns)->menu();
+    UIMenu *pMenu = m_pActionPool->action(UIActionIndexMN_M_VMResourceMonitor_M_Columns)->menu();
     if (!pMenu)
         return;
@@ -1438 +1438 @@
     updateColumnsMenu();
     m_pShowPerformanceMonitorAction =
-        m_pActionPool->action(UIActionIndexST_M_VMResourceMonitor_S_SwitchToMachinePerformance);
+        m_pActionPool->action(UIActionIndexMN_M_VMResourceMonitor_S_SwitchToMachinePerformance);
 
     if (m_pShowPerformanceMonitorAction)

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -1083 +1083 @@
     if (m_pCurrentSnapshotItem && !pSnapshotItem->isCurrentStateItem())
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Delete));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Delete));
         menu.addSeparator();
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Restore));
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Restore));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties));
         menu.addSeparator();
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone));
     }
     /* For "current state" item: */
     else
     {
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Take));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Take));
         menu.addSeparator();
-        menu.addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone));
+        menu.addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone));
     }
 
@@ -1172 +1172 @@
         {
             /* As show details-widget procedure: */
-            m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties)->setChecked(true);
+            m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties)->setChecked(true);
         }
     }
@@ -1231 +1231 @@
 {
     /* First of all, add actions which has smaller shortcut scope: */
-    addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Take));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Delete));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Restore));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties));
-    addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Take));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Delete));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Restore));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties));
+    addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone));
 
     /* Connect actions: */
-    connect(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Take), &UIAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Take), &UIAction::triggered,
             this, &UISnapshotPane::sltTakeSnapshot);
-    connect(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Delete), &UIAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Delete), &UIAction::triggered,
             this, &UISnapshotPane::sltDeleteSnapshot);
-    connect(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Restore), &UIAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Restore), &UIAction::triggered,
             this, &UISnapshotPane::sltRestoreSnapshot);
-    connect(m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties), &UIAction::toggled,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties), &UIAction::toggled,
             this, &UISnapshotPane::sltToggleSnapshotDetailsVisibility);
-    connect(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone), &UIAction::triggered,
+    connect(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone), &UIAction::triggered,
             this, &UISnapshotPane::sltCloneSnapshot);
 }
@@ -1286 +1286 @@
 
         /* Add toolbar actions: */
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Take));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Delete));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Take));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Delete));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Restore));
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Restore));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties));
         m_pToolBar->addSeparator();
-        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone));
+        m_pToolBar->addAction(m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone));
 
         /* Add into layout: */
@@ -1339 +1339 @@
 {
     /* Details action/widget: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties)->
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties)->
         setChecked(gEDataManager->snapshotManagerDetailsExpanded());
 }
@@ -1485 +1485 @@
 
     /* Update 'Take' action: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Take)->setEnabled(
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Take)->setEnabled(
            m_fShapshotOperationsAllowed
         && (   (   fCanTakeDeleteSnapshot
@@ -1496 +1496 @@
 
     /* Update 'Delete' action: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Delete)->setEnabled(
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Delete)->setEnabled(
            m_fShapshotOperationsAllowed
         && fCanTakeDeleteSnapshot
@@ -1505 +1505 @@
 
     /* Update 'Restore' action: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Restore)->setEnabled(
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Restore)->setEnabled(
            !fBusy
         && m_pCurrentSnapshotItem
@@ -1513 +1513 @@
 
     /* Update 'Show Details' action: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_T_Properties)->setEnabled(
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_T_Properties)->setEnabled(
         pSnapshotItem
     );
 
     /* Update 'Clone' action: */
-    m_pActionPool->action(UIActionIndexST_M_Snapshot_S_Clone)->setEnabled(
+    m_pActionPool->action(UIActionIndexMN_M_Snapshot_S_Clone)->setEnabled(
            pSnapshotItem
         && (   !pSnapshotItem->isCurrentStateItem()