VirtualBox

Ignore:
Timestamp:
Jul 22, 2014 5:01:15 PM (10 years ago)
Author:
vboxsync
Message:

FE/Qt: 7462: Runtime UI: Menu-bar, menu cleanup/rework (part 05).

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp

    r52115 r52133  
    14081408
    14091409    /* 'Machine' actions: */
    1410     m_pool[UIActionIndexRuntime_Simple_SettingsDialog] = new UIActionSimpleShowSettingsDialog(this);
    1411     m_pool[UIActionIndexRuntime_Simple_TakeSnapshot] = new UIActionSimplePerformTakeSnapshot(this);
    1412     m_pool[UIActionIndexRuntime_Simple_TakeScreenshot] = new UIActionSimplePerformTakeScreenshot(this);
    1413     m_pool[UIActionIndexRuntime_Simple_InformationDialog] = new UIActionSimpleShowInformationDialog(this);
    1414     m_pool[UIActionIndexRuntime_Simple_KeyboardSettings] = new UIActionSimpleKeyboardSettings(this);
    1415     m_pool[UIActionIndexRuntime_Toggle_MouseIntegration] = new UIActionToggleMouseIntegration(this);
    1416     m_pool[UIActionIndexRuntime_Simple_TypeCAD] = new UIActionSimplePerformTypeCAD(this);
     1410    m_pool[UIActionIndexRT_M_Machine_S_Settings] = new UIActionSimpleShowSettingsDialog(this);
     1411    m_pool[UIActionIndexRT_M_Machine_S_TakeSnapshot] = new UIActionSimplePerformTakeSnapshot(this);
     1412    m_pool[UIActionIndexRT_M_Machine_S_TakeScreenshot] = new UIActionSimplePerformTakeScreenshot(this);
     1413    m_pool[UIActionIndexRT_M_Machine_S_ShowInformation] = new UIActionSimpleShowInformationDialog(this);
     1414    m_pool[UIActionIndexRT_M_Machine_M_Keyboard_S_Settings] = new UIActionSimpleKeyboardSettings(this);
     1415    m_pool[UIActionIndexRT_M_Machine_M_Mouse_T_Integration] = new UIActionToggleMouseIntegration(this);
     1416    m_pool[UIActionIndexRT_M_Machine_S_TypeCAD] = new UIActionSimplePerformTypeCAD(this);
    14171417#ifdef Q_WS_X11
    1418     m_pool[UIActionIndexRuntime_Simple_TypeCABS] = new UIActionSimplePerformTypeCABS(this);
     1418    m_pool[UIActionIndexRT_M_Machine_S_TypeCABS] = new UIActionSimplePerformTypeCABS(this);
    14191419#endif /* Q_WS_X11 */
    1420     m_pool[UIActionIndexRuntime_Toggle_Pause] = new UIActionTogglePause(this);
    1421     m_pool[UIActionIndexRuntime_Simple_Reset] = new UIActionSimplePerformReset(this);
    1422     m_pool[UIActionIndexRuntime_Simple_Save] = new UIActionSimplePerformSave(this);
    1423     m_pool[UIActionIndexRuntime_Simple_Shutdown] = new UIActionSimplePerformShutdown(this);
    1424     m_pool[UIActionIndexRuntime_Simple_PowerOff] = new UIActionSimplePerformPowerOff(this);
    1425     m_pool[UIActionIndexRuntime_Simple_Close] = new UIActionSimplePerformClose(this);
     1420    m_pool[UIActionIndexRT_M_Machine_T_Pause] = new UIActionTogglePause(this);
     1421    m_pool[UIActionIndexRT_M_Machine_S_Reset] = new UIActionSimplePerformReset(this);
     1422    m_pool[UIActionIndexRT_M_Machine_S_Save] = new UIActionSimplePerformSave(this);
     1423    m_pool[UIActionIndexRT_M_Machine_S_Shutdown] = new UIActionSimplePerformShutdown(this);
     1424    m_pool[UIActionIndexRT_M_Machine_S_PowerOff] = new UIActionSimplePerformPowerOff(this);
     1425    m_pool[UIActionIndexRT_M_Machine_S_Close] = new UIActionSimplePerformClose(this);
    14261426
    14271427    /* 'View' actions: */
    1428     m_pool[UIActionIndexRuntime_Toggle_Fullscreen] = new UIActionToggleFullscreenMode(this);
    1429     m_pool[UIActionIndexRuntime_Toggle_Seamless] = new UIActionToggleSeamlessMode(this);
    1430     m_pool[UIActionIndexRuntime_Toggle_Scale] = new UIActionToggleScaleMode(this);
    1431     m_pool[UIActionIndexRuntime_Toggle_GuestAutoresize] = new UIActionToggleGuestAutoresize(this);
    1432     m_pool[UIActionIndexRuntime_Simple_AdjustWindow] = new UIActionSimplePerformWindowAdjust(this);
    1433     m_pool[UIActionIndexRuntime_Simple_StatusBarSettings] = new UIActionSimpleShowStatusBarSettingsWindow(this);
    1434     m_pool[UIActionIndexRuntime_Toggle_StatusBar] = new UIActionToggleStatusBar(this);
     1428    m_pool[UIActionIndexRT_M_View_T_Fullscreen] = new UIActionToggleFullscreenMode(this);
     1429    m_pool[UIActionIndexRT_M_View_T_Seamless] = new UIActionToggleSeamlessMode(this);
     1430    m_pool[UIActionIndexRT_M_View_T_Scale] = new UIActionToggleScaleMode(this);
     1431    m_pool[UIActionIndexRT_M_View_T_GuestAutoresize] = new UIActionToggleGuestAutoresize(this);
     1432    m_pool[UIActionIndexRT_M_View_S_AdjustWindow] = new UIActionSimplePerformWindowAdjust(this);
     1433    m_pool[UIActionIndexRT_M_View_M_StatusBar_S_Settings] = new UIActionSimpleShowStatusBarSettingsWindow(this);
     1434    m_pool[UIActionIndexRT_M_View_M_StatusBar_T_Visibility] = new UIActionToggleStatusBar(this);
    14351435
    14361436    /* 'Devices' actions: */
    1437     m_pool[UIActionIndexRuntime_Simple_StorageSettings] = new UIActionSimpleShowStorageSettingsDialog(this);
    1438     m_pool[UIActionIndexRuntime_Simple_NetworkSettings] = new UIActionSimpleShowNetworkSettingsDialog(this);
    1439     m_pool[UIActionIndexRuntime_Simple_SharedFoldersSettings] = new UIActionSimpleShowSharedFoldersSettingsDialog(this);
    1440     m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new UIActionToggleVRDEServer(this);
    1441     m_pool[UIActionIndexRuntime_Toggle_VideoCapture] = new UIActionToggleVideoCapture(this);
    1442     m_pool[UIActionIndexRuntime_Simple_VideoCaptureSettings] = new UIActionSimpleShowVideoCaptureSettingsDialog(this);
    1443     m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new UIActionSimplePerformInstallGuestTools(this);
     1437    m_pool[UIActionIndexRT_M_Devices_M_HardDrives_S_Settings] = new UIActionSimpleShowStorageSettingsDialog(this);
     1438    m_pool[UIActionIndexRT_M_Devices_M_Network_S_Settings] = new UIActionSimpleShowNetworkSettingsDialog(this);
     1439    m_pool[UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings] = new UIActionSimpleShowSharedFoldersSettingsDialog(this);
     1440    m_pool[UIActionIndexRT_M_Devices_T_VRDEServer] = new UIActionToggleVRDEServer(this);
     1441    m_pool[UIActionIndexRT_M_Devices_M_VideoCapture_T_Start] = new UIActionToggleVideoCapture(this);
     1442    m_pool[UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings] = new UIActionSimpleShowVideoCaptureSettingsDialog(this);
     1443    m_pool[UIActionIndexRT_M_Devices_S_InstallGuestTools] = new UIActionSimplePerformInstallGuestTools(this);
    14441444
    14451445#ifdef VBOX_WITH_DEBUGGER_GUI
    14461446    /* 'Debug' actions: */
    1447     m_pool[UIActionIndexRuntime_Simple_Statistics] = new UIActionSimpleShowStatistics(this);
    1448     m_pool[UIActionIndexRuntime_Simple_CommandLine] = new UIActionSimpleShowCommandLine(this);
    1449     m_pool[UIActionIndexRuntime_Toggle_Logging] = new UIActionToggleLogging(this);
     1447    m_pool[UIActionIndexRT_M_Debug_S_ShowStatistics] = new UIActionSimpleShowStatistics(this);
     1448    m_pool[UIActionIndexRT_M_Debug_S_ShowCommandLine] = new UIActionSimpleShowCommandLine(this);
     1449    m_pool[UIActionIndexRT_M_Debug_T_Logging] = new UIActionToggleLogging(this);
    14501450#endif /* VBOX_WITH_DEBUGGER_GUI */
    14511451
    14521452#ifdef Q_WS_MAC
    14531453    /* 'Dock' actions: */
    1454     m_pool[UIActionIndexRuntime_Toggle_DockPreviewMonitor] = new UIActionToggleDockPreviewMonitor(this);
    1455     m_pool[UIActionIndexRuntime_Toggle_DockDisableMonitor] = new UIActionToggleDockDisableMonitor(this);
     1454    m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_PreviewMonitor] = new UIActionToggleDockPreviewMonitor(this);
     1455    m_pool[UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor] = new UIActionToggleDockDisableMonitor(this);
    14561456#endif /* Q_WS_MAC */
    14571457}
    … …  
    14681468    /* Recreate 'close' item as well.
    14691469     * This makes sure it is removed also from the Application menu: */
    1470     if (m_pool[UIActionIndexRuntime_Simple_Close])
    1471         delete m_pool[UIActionIndexRuntime_Simple_Close];
    1472     m_pool[UIActionIndexRuntime_Simple_Close] = new UIActionSimplePerformClose(this);
     1470    if (m_pool[UIActionIndexRT_M_Machine_S_Close])
     1471        delete m_pool[UIActionIndexRT_M_Machine_S_Close];
     1472    m_pool[UIActionIndexRT_M_Machine_S_Close] = new UIActionSimplePerformClose(this);
    14731473
    14741474    /* 'Machine' menu: */
    1475     if (m_pool[UIActionIndexRuntime_Menu_Machine])
    1476         delete m_pool[UIActionIndexRuntime_Menu_Machine];
    1477     m_pool[UIActionIndexRuntime_Menu_Machine] = new UIActionMenuMachineRuntime(this);
    1478     if (m_pool[UIActionIndexRuntime_Menu_Keyboard])
    1479         delete m_pool[UIActionIndexRuntime_Menu_Keyboard];
    1480     m_pool[UIActionIndexRuntime_Menu_Keyboard] = new UIActionMenuKeyboard(this);
    1481     if (m_pool[UIActionIndexRuntime_Menu_MouseIntegration])
    1482         delete m_pool[UIActionIndexRuntime_Menu_MouseIntegration];
    1483     m_pool[UIActionIndexRuntime_Menu_MouseIntegration] = new UIActionMenuMouseIntegration(this);
     1475    if (m_pool[UIActionIndexRT_M_Machine])
     1476        delete m_pool[UIActionIndexRT_M_Machine];
     1477    m_pool[UIActionIndexRT_M_Machine] = new UIActionMenuMachineRuntime(this);
     1478    if (m_pool[UIActionIndexRT_M_Machine_M_Keyboard])
     1479        delete m_pool[UIActionIndexRT_M_Machine_M_Keyboard];
     1480    m_pool[UIActionIndexRT_M_Machine_M_Keyboard] = new UIActionMenuKeyboard(this);
     1481    if (m_pool[UIActionIndexRT_M_Machine_M_Mouse])
     1482        delete m_pool[UIActionIndexRT_M_Machine_M_Mouse];
     1483    m_pool[UIActionIndexRT_M_Machine_M_Mouse] = new UIActionMenuMouseIntegration(this);
    14841484
    14851485    /* 'View' menu: */
    1486     if (m_pool[UIActionIndexRuntime_Menu_View])
    1487         delete m_pool[UIActionIndexRuntime_Menu_View];
    1488     m_pool[UIActionIndexRuntime_Menu_View] = new UIActionMenuView(this);
    1489     if (m_pool[UIActionIndexRuntime_Menu_ViewPopup])
    1490         delete m_pool[UIActionIndexRuntime_Menu_ViewPopup];
    1491     m_pool[UIActionIndexRuntime_Menu_ViewPopup] = new UIActionMenuViewPopup(this);
    1492     if (m_pool[UIActionIndexRuntime_Menu_StatusBar])
    1493         delete m_pool[UIActionIndexRuntime_Menu_StatusBar];
    1494     m_pool[UIActionIndexRuntime_Menu_StatusBar] = new UIActionMenuStatusBar(this);
     1486    if (m_pool[UIActionIndexRT_M_View])
     1487        delete m_pool[UIActionIndexRT_M_View];
     1488    m_pool[UIActionIndexRT_M_View] = new UIActionMenuView(this);
     1489    if (m_pool[UIActionIndexRT_M_ViewPopup])
     1490        delete m_pool[UIActionIndexRT_M_ViewPopup];
     1491    m_pool[UIActionIndexRT_M_ViewPopup] = new UIActionMenuViewPopup(this);
     1492    if (m_pool[UIActionIndexRT_M_View_M_StatusBar])
     1493        delete m_pool[UIActionIndexRT_M_View_M_StatusBar];
     1494    m_pool[UIActionIndexRT_M_View_M_StatusBar] = new UIActionMenuStatusBar(this);
    14951495
    14961496    /* 'Devices' menu: */
    1497     if (m_pool[UIActionIndexRuntime_Menu_Devices])
    1498         delete m_pool[UIActionIndexRuntime_Menu_Devices];
    1499     m_pool[UIActionIndexRuntime_Menu_Devices] = new UIActionMenuDevices(this);
    1500     if (m_pool[UIActionIndexRuntime_Menu_HardDisks])
    1501         delete m_pool[UIActionIndexRuntime_Menu_HardDisks];
    1502     m_pool[UIActionIndexRuntime_Menu_HardDisks] = new UIActionMenuHardDisks(this);
    1503     if (m_pool[UIActionIndexRuntime_Menu_OpticalDevices])
    1504         delete m_pool[UIActionIndexRuntime_Menu_OpticalDevices];
    1505     m_pool[UIActionIndexRuntime_Menu_OpticalDevices] = new UIActionMenuOpticalDevices(this);
    1506     if (m_pool[UIActionIndexRuntime_Menu_FloppyDevices])
    1507         delete m_pool[UIActionIndexRuntime_Menu_FloppyDevices];
    1508     m_pool[UIActionIndexRuntime_Menu_FloppyDevices] = new UIActionMenuFloppyDevices(this);
    1509     if (m_pool[UIActionIndexRuntime_Menu_USBDevices])
    1510         delete m_pool[UIActionIndexRuntime_Menu_USBDevices];
    1511     m_pool[UIActionIndexRuntime_Menu_USBDevices] = new UIActionMenuUSBDevices(this);
    1512     if (m_pool[UIActionIndexRuntime_Menu_WebCams])
    1513         delete m_pool[UIActionIndexRuntime_Menu_WebCams];
    1514     m_pool[UIActionIndexRuntime_Menu_WebCams] = new UIActionMenuWebCams(this);
    1515     if (m_pool[UIActionIndexRuntime_Menu_SharedClipboard])
    1516         delete m_pool[UIActionIndexRuntime_Menu_SharedClipboard];
    1517     m_pool[UIActionIndexRuntime_Menu_SharedClipboard] = new UIActionMenuSharedClipboard(this);
    1518     if (m_pool[UIActionIndexRuntime_Menu_DragAndDrop])
    1519         delete m_pool[UIActionIndexRuntime_Menu_DragAndDrop];
    1520     m_pool[UIActionIndexRuntime_Menu_DragAndDrop] = new UIActionMenuDragAndDrop(this);
    1521     if (m_pool[UIActionIndexRuntime_Menu_Network])
    1522         delete m_pool[UIActionIndexRuntime_Menu_Network];
    1523     m_pool[UIActionIndexRuntime_Menu_Network] = new UIActionMenuNetworkAdapters(this);
    1524     if (m_pool[UIActionIndexRuntime_Menu_SharedFolders])
    1525         delete m_pool[UIActionIndexRuntime_Menu_SharedFolders];
    1526     m_pool[UIActionIndexRuntime_Menu_SharedFolders] = new UIActionMenuSharedFolders(this);
    1527     if (m_pool[UIActionIndexRuntime_Menu_VideoCapture])
    1528         delete m_pool[UIActionIndexRuntime_Menu_VideoCapture];
    1529     m_pool[UIActionIndexRuntime_Menu_VideoCapture] = new UIActionMenuVideoCapture(this);
     1497    if (m_pool[UIActionIndexRT_M_Devices])
     1498        delete m_pool[UIActionIndexRT_M_Devices];
     1499    m_pool[UIActionIndexRT_M_Devices] = new UIActionMenuDevices(this);
     1500    if (m_pool[UIActionIndexRT_M_Devices_M_HardDrives])
     1501        delete m_pool[UIActionIndexRT_M_Devices_M_HardDrives];
     1502    m_pool[UIActionIndexRT_M_Devices_M_HardDrives] = new UIActionMenuHardDisks(this);
     1503    if (m_pool[UIActionIndexRT_M_Devices_M_OpticalDevices])
     1504        delete m_pool[UIActionIndexRT_M_Devices_M_OpticalDevices];
     1505    m_pool[UIActionIndexRT_M_Devices_M_OpticalDevices] = new UIActionMenuOpticalDevices(this);
     1506    if (m_pool[UIActionIndexRT_M_Devices_M_FloppyDevices])
     1507        delete m_pool[UIActionIndexRT_M_Devices_M_FloppyDevices];
     1508    m_pool[UIActionIndexRT_M_Devices_M_FloppyDevices] = new UIActionMenuFloppyDevices(this);
     1509    if (m_pool[UIActionIndexRT_M_Devices_M_USBDevices])
     1510        delete m_pool[UIActionIndexRT_M_Devices_M_USBDevices];
     1511    m_pool[UIActionIndexRT_M_Devices_M_USBDevices] = new UIActionMenuUSBDevices(this);
     1512    if (m_pool[UIActionIndexRT_M_Devices_M_WebCams])
     1513        delete m_pool[UIActionIndexRT_M_Devices_M_WebCams];
     1514    m_pool[UIActionIndexRT_M_Devices_M_WebCams] = new UIActionMenuWebCams(this);
     1515    if (m_pool[UIActionIndexRT_M_Devices_M_SharedClipboard])
     1516        delete m_pool[UIActionIndexRT_M_Devices_M_SharedClipboard];
     1517    m_pool[UIActionIndexRT_M_Devices_M_SharedClipboard] = new UIActionMenuSharedClipboard(this);
     1518    if (m_pool[UIActionIndexRT_M_Devices_M_DragAndDrop])
     1519        delete m_pool[UIActionIndexRT_M_Devices_M_DragAndDrop];
     1520    m_pool[UIActionIndexRT_M_Devices_M_DragAndDrop] = new UIActionMenuDragAndDrop(this);
     1521    if (m_pool[UIActionIndexRT_M_Devices_M_Network])
     1522        delete m_pool[UIActionIndexRT_M_Devices_M_Network];
     1523    m_pool[UIActionIndexRT_M_Devices_M_Network] = new UIActionMenuNetworkAdapters(this);
     1524    if (m_pool[UIActionIndexRT_M_Devices_M_SharedFolders])
     1525        delete m_pool[UIActionIndexRT_M_Devices_M_SharedFolders];
     1526    m_pool[UIActionIndexRT_M_Devices_M_SharedFolders] = new UIActionMenuSharedFolders(this);
     1527    if (m_pool[UIActionIndexRT_M_Devices_M_VideoCapture])
     1528        delete m_pool[UIActionIndexRT_M_Devices_M_VideoCapture];
     1529    m_pool[UIActionIndexRT_M_Devices_M_VideoCapture] = new UIActionMenuVideoCapture(this);
    15301530
    15311531#ifdef VBOX_WITH_DEBUGGER_GUI
    15321532    /* 'Debug' menu: */
    1533     if (m_pool[UIActionIndexRuntime_Menu_Debug])
    1534         delete m_pool[UIActionIndexRuntime_Menu_Debug];
    1535     m_pool[UIActionIndexRuntime_Menu_Debug] = new UIActionMenuDebug(this);
     1533    if (m_pool[UIActionIndexRT_M_Debug])
     1534        delete m_pool[UIActionIndexRT_M_Debug];
     1535    m_pool[UIActionIndexRT_M_Debug] = new UIActionMenuDebug(this);
    15361536#endif /* VBOX_WITH_DEBUGGER_GUI */
    15371537
    15381538#ifdef Q_WS_MAC
    15391539    /* 'Dock' menu: */
    1540     if (m_pool[UIActionIndexRuntime_Menu_Dock])
    1541         delete m_pool[UIActionIndexRuntime_Menu_Dock];
    1542     m_pool[UIActionIndexRuntime_Menu_Dock] = new UIActionMenuDock(this);
    1543     if (m_pool[UIActionIndexRuntime_Menu_DockSettings])
    1544         delete m_pool[UIActionIndexRuntime_Menu_DockSettings];
    1545     m_pool[UIActionIndexRuntime_Menu_DockSettings] = new UIActionMenuDockSettings(this);
     1540    if (m_pool[UIActionIndexRT_M_Dock])
     1541        delete m_pool[UIActionIndexRT_M_Dock];
     1542    m_pool[UIActionIndexRT_M_Dock] = new UIActionMenuDock(this);
     1543    if (m_pool[UIActionIndexRT_M_Dock_M_DockSettings])
     1544        delete m_pool[UIActionIndexRT_M_Dock_M_DockSettings];
     1545    m_pool[UIActionIndexRT_M_Dock_M_DockSettings] = new UIActionMenuDockSettings(this);
    15461546#endif /* Q_WS_MAC */
    15471547}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h

    r52112 r52133  
    2323#include "UIActionPool.h"
    2424
    25 /* Action keys: */
    26 enum UIActionIndexRuntime
     25/** Runtime action-pool index enum.
     26  * Naming convention is following:
     27  * 1. Every simple-action index prepended with 'S',
     28  * 2. Every toggle-action index presended with 'T',
     29  * 3. Every menu index prepended with 'M',
     30  * 4. Every sub-index contains full parent-index name. */
     31enum UIActionIndexRT
    2732{
    2833    /* 'Machine' menu actions: */
    29     UIActionIndexRuntime_Menu_Machine = UIActionIndex_Max + 1,
    30     UIActionIndexRuntime_Simple_SettingsDialog,
    31     UIActionIndexRuntime_Simple_TakeSnapshot,
    32     UIActionIndexRuntime_Simple_TakeScreenshot,
    33     UIActionIndexRuntime_Simple_InformationDialog,
    34     UIActionIndexRuntime_Menu_Keyboard,
    35     UIActionIndexRuntime_Simple_KeyboardSettings,
    36     UIActionIndexRuntime_Menu_MouseIntegration,
    37     UIActionIndexRuntime_Toggle_MouseIntegration,
    38     UIActionIndexRuntime_Simple_TypeCAD,
     34    UIActionIndexRT_M_Machine = UIActionIndex_Max + 1,
     35    UIActionIndexRT_M_Machine_S_Settings,
     36    UIActionIndexRT_M_Machine_S_TakeSnapshot,
     37    UIActionIndexRT_M_Machine_S_TakeScreenshot,
     38    UIActionIndexRT_M_Machine_S_ShowInformation,
     39    UIActionIndexRT_M_Machine_M_Keyboard,
     40    UIActionIndexRT_M_Machine_M_Keyboard_S_Settings,
     41    UIActionIndexRT_M_Machine_M_Mouse,
     42    UIActionIndexRT_M_Machine_M_Mouse_T_Integration,
     43    UIActionIndexRT_M_Machine_S_TypeCAD,
    3944#ifdef Q_WS_X11
    40     UIActionIndexRuntime_Simple_TypeCABS,
     45    UIActionIndexRT_M_Machine_S_TypeCABS,
    4146#endif /* Q_WS_X11 */
    42     UIActionIndexRuntime_Toggle_Pause,
    43     UIActionIndexRuntime_Simple_Reset,
    44     UIActionIndexRuntime_Simple_Save,
    45     UIActionIndexRuntime_Simple_Shutdown,
    46     UIActionIndexRuntime_Simple_PowerOff,
    47     UIActionIndexRuntime_Simple_Close,
     47    UIActionIndexRT_M_Machine_T_Pause,
     48    UIActionIndexRT_M_Machine_S_Reset,
     49    UIActionIndexRT_M_Machine_S_Save,
     50    UIActionIndexRT_M_Machine_S_Shutdown,
     51    UIActionIndexRT_M_Machine_S_PowerOff,
     52    UIActionIndexRT_M_Machine_S_Close,
    4853
    4954    /* 'View' menu actions: */
    50     UIActionIndexRuntime_Menu_View,
    51     UIActionIndexRuntime_Menu_ViewPopup,
    52     UIActionIndexRuntime_Toggle_Fullscreen,
    53     UIActionIndexRuntime_Toggle_Seamless,
    54     UIActionIndexRuntime_Toggle_Scale,
    55     UIActionIndexRuntime_Toggle_GuestAutoresize,
    56     UIActionIndexRuntime_Simple_AdjustWindow,
    57     UIActionIndexRuntime_Menu_StatusBar,
    58     UIActionIndexRuntime_Simple_StatusBarSettings,
    59     UIActionIndexRuntime_Toggle_StatusBar,
     55    UIActionIndexRT_M_View,
     56    UIActionIndexRT_M_ViewPopup,
     57    UIActionIndexRT_M_View_T_Fullscreen,
     58    UIActionIndexRT_M_View_T_Seamless,
     59    UIActionIndexRT_M_View_T_Scale,
     60    UIActionIndexRT_M_View_S_AdjustWindow,
     61    UIActionIndexRT_M_View_T_GuestAutoresize,
     62    UIActionIndexRT_M_View_M_StatusBar,
     63    UIActionIndexRT_M_View_M_StatusBar_S_Settings,
     64    UIActionIndexRT_M_View_M_StatusBar_T_Visibility,
    6065
    6166    /* 'Devices' menu actions: */
    62     UIActionIndexRuntime_Menu_Devices,
    63     UIActionIndexRuntime_Menu_HardDisks,
    64     UIActionIndexRuntime_Simple_StorageSettings,
    65     UIActionIndexRuntime_Menu_OpticalDevices,
    66     UIActionIndexRuntime_Menu_FloppyDevices,
    67     UIActionIndexRuntime_Menu_USBDevices,
    68     UIActionIndexRuntime_Menu_WebCams,
    69     UIActionIndexRuntime_Menu_SharedClipboard,
    70     UIActionIndexRuntime_Menu_DragAndDrop,
    71     UIActionIndexRuntime_Menu_Network,
    72     UIActionIndexRuntime_Simple_NetworkSettings,
    73     UIActionIndexRuntime_Menu_SharedFolders,
    74     UIActionIndexRuntime_Simple_SharedFoldersSettings,
    75     UIActionIndexRuntime_Toggle_VRDEServer,
    76     UIActionIndexRuntime_Menu_VideoCapture,
    77     UIActionIndexRuntime_Toggle_VideoCapture,
    78     UIActionIndexRuntime_Simple_VideoCaptureSettings,
    79     UIActionIndexRuntime_Simple_InstallGuestTools,
     67    UIActionIndexRT_M_Devices,
     68    UIActionIndexRT_M_Devices_M_HardDrives,
     69    UIActionIndexRT_M_Devices_M_HardDrives_S_Settings,
     70    UIActionIndexRT_M_Devices_M_OpticalDevices,
     71    UIActionIndexRT_M_Devices_M_FloppyDevices,
     72    UIActionIndexRT_M_Devices_M_USBDevices,
     73    UIActionIndexRT_M_Devices_M_WebCams,
     74    UIActionIndexRT_M_Devices_M_SharedClipboard,
     75    UIActionIndexRT_M_Devices_M_DragAndDrop,
     76    UIActionIndexRT_M_Devices_M_Network,
     77    UIActionIndexRT_M_Devices_M_Network_S_Settings,
     78    UIActionIndexRT_M_Devices_M_SharedFolders,
     79    UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings,
     80    UIActionIndexRT_M_Devices_T_VRDEServer,
     81    UIActionIndexRT_M_Devices_M_VideoCapture,
     82    UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings,
     83    UIActionIndexRT_M_Devices_M_VideoCapture_T_Start,
     84    UIActionIndexRT_M_Devices_S_InstallGuestTools,
    8085
    8186#ifdef VBOX_WITH_DEBUGGER_GUI
    8287    /* 'Debugger' menu actions: */
    83     UIActionIndexRuntime_Menu_Debug,
    84     UIActionIndexRuntime_Simple_Statistics,
    85     UIActionIndexRuntime_Simple_CommandLine,
    86     UIActionIndexRuntime_Toggle_Logging,
     88    UIActionIndexRT_M_Debug,
     89    UIActionIndexRT_M_Debug_S_ShowStatistics,
     90    UIActionIndexRT_M_Debug_S_ShowCommandLine,
     91    UIActionIndexRT_M_Debug_T_Logging,
    8792#endif /* VBOX_WITH_DEBUGGER_GUI */
    8893
    8994#ifdef Q_WS_MAC
    9095    /* 'Dock' menu actions: */
    91     UIActionIndexRuntime_Menu_Dock,
    92     UIActionIndexRuntime_Menu_DockSettings,
    93     UIActionIndexRuntime_Toggle_DockPreviewMonitor,
    94     UIActionIndexRuntime_Toggle_DockDisableMonitor,
     96    UIActionIndexRT_M_Dock,
     97    UIActionIndexRT_M_Dock_M_DockSettings,
     98    UIActionIndexRT_M_Dock_M_DockSettings_T_PreviewMonitor,
     99    UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor,
    95100#endif /* Q_WS_MAC */
    96101
    97102    /* Maximum index: */
    98     UIActionIndexRuntime_Max
     103    UIActionIndexRT_Max
    99104};
    100105

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r52132 r52133  
    273273    /* Append 'Machine' menu: */
    274274    if (uisession()->allowedMenus() & RuntimeMenuType_Machine)
    275         result << gActionPool->action(UIActionIndexRuntime_Menu_Machine)->menu();
     275        result << gActionPool->action(UIActionIndexRT_M_Machine)->menu();
    276276    /* Append 'View' menu: */
    277277    if (uisession()->allowedMenus() & RuntimeMenuType_View)
    278         result << gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
     278        result << gActionPool->action(UIActionIndexRT_M_View)->menu();
    279279    /* Append 'Devices' menu: */
    280280    if (uisession()->allowedMenus() & RuntimeMenuType_Devices)
    281         result << gActionPool->action(UIActionIndexRuntime_Menu_Devices)->menu();
     281        result << gActionPool->action(UIActionIndexRT_M_Devices)->menu();
    282282#ifdef VBOX_WITH_DEBUGGER_GUI
    283283    /* Append 'Debug' menu: */
    284284    if (uisession()->allowedMenus() & RuntimeMenuType_Debug)
    285         result << gActionPool->action(UIActionIndexRuntime_Menu_Debug)->menu();
     285        result << gActionPool->action(UIActionIndexRT_M_Debug)->menu();
    286286#endif /* VBOX_WITH_DEBUGGER_GUI */
    287287    /* Append 'Help' menu: */
    … …  
    474474        case KMachineState_TeleportingPausedVM:
    475475        {
    476             QAction *pPauseAction = gActionPool->action(UIActionIndexRuntime_Toggle_Pause);
     476            QAction *pPauseAction = gActionPool->action(UIActionIndexRT_M_Machine_T_Pause);
    477477            if (!pPauseAction->isChecked())
    478478            {
    … …  
    488488        case KMachineState_LiveSnapshotting:
    489489        {
    490             QAction *pPauseAction = gActionPool->action(UIActionIndexRuntime_Toggle_Pause);
     490            QAction *pPauseAction = gActionPool->action(UIActionIndexRT_M_Machine_T_Pause);
    491491            if (pPauseAction->isChecked())
    492492            {
    … …  
    536536{
    537537    /* Update action states: */
    538     gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->setEnabled(uisession()->isGuestSupportsGraphics());
    539     gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(uisession()->isVisualStateAllowed(UIVisualStateType_Seamless) &&
     538    gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize)->setEnabled(uisession()->isGuestSupportsGraphics());
     539    gActionPool->action(UIActionIndexRT_M_View_T_Seamless)->setEnabled(uisession()->isVisualStateAllowed(UIVisualStateType_Seamless) &&
    540540                                                                          uisession()->isGuestSupportsSeamless());
    541541}
    … …  
    553553
    554554    /* Update action state: */
    555     QAction *pAction = gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration);
     555    QAction *pAction = gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration);
    556556    pAction->setEnabled(fIsMouseSupportsAbsolute && fIsMouseSupportsRelative && !fIsMouseHostCursorNeeded);
    557557    if (fIsMouseHostCursorNeeded)
    … …  
    862862
    863863    /* Move actions into running actions group: */
    864     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TypeCAD));
     864    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCAD));
    865865#ifdef Q_WS_X11
    866     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TypeCABS));
     866    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCABS));
    867867#endif
    868     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Reset));
    869     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Shutdown));
    870     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_ViewPopup));
    871     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen));
    872     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless));
    873     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Scale));
    874     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize));
    875     m_pRunningActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow));
     868    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Reset));
     869    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Shutdown));
     870    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_ViewPopup));
     871    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen));
     872    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Seamless));
     873    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Scale));
     874    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize));
     875    m_pRunningActions->addAction(gActionPool->action(UIActionIndexRT_M_View_S_AdjustWindow));
    876876
    877877    /* Move actions into running-n-paused actions group: */
    878     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Save));
    879     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog));
    880     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot));
    881     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeScreenshot));
    882     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InformationDialog));
    883     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_Keyboard));
    884     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_KeyboardSettings));
    885     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_MouseIntegration));
    886     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration));
    887     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Pause));
    888     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_StatusBar));
    889     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings));
    890     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar));
    891     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_HardDisks));
    892     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_StorageSettings));
    893     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices));
    894     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices));
    895     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices));
    896     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_WebCams));
    897     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard));
    898     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop));
    899     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_Network));
    900     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
    901     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
    902     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
    903     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
    904     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture));
    905     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
    906     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings));
    907     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
     878    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Save));
     879    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Settings));
     880    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeSnapshot));
     881    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeScreenshot));
     882    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_ShowInformation));
     883    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard));
     884    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
     885    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse));
     886    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration));
     887    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_T_Pause));
     888    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar));
     889    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings));
     890    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility));
     891    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives));
     892    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings));
     893    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices));
     894    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices));
     895    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices));
     896    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams));
     897    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedClipboard));
     898    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_DragAndDrop));
     899    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_Network));
     900    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings));
     901    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders));
     902    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
     903    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer));
     904    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture));
     905    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start));
     906    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings));
     907    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRT_M_Devices_S_InstallGuestTools));
    908908
    909909    /* Move actions into running-n-paused-n-stucked actions group: */
    910     m_pRunningOrPausedOrStackedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
     910    m_pRunningOrPausedOrStackedActions->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_PowerOff));
    911911}
    912912
    … …  
    914914{
    915915    /* "Machine" actions connections: */
    916     connect(gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog), SIGNAL(triggered()),
     916    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_Settings), SIGNAL(triggered()),
    917917            this, SLOT(sltOpenVMSettingsDialog()));
    918     connect(gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot), SIGNAL(triggered()),
     918    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeSnapshot), SIGNAL(triggered()),
    919919            this, SLOT(sltTakeSnapshot()));
    920     connect(gActionPool->action(UIActionIndexRuntime_Simple_TakeScreenshot), SIGNAL(triggered()),
     920    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeScreenshot), SIGNAL(triggered()),
    921921            this, SLOT(sltTakeScreenshot()));
    922     connect(gActionPool->action(UIActionIndexRuntime_Simple_InformationDialog), SIGNAL(triggered()),
     922    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_ShowInformation), SIGNAL(triggered()),
    923923            this, SLOT(sltShowInformationDialog()));
    924     connect(gActionPool->action(UIActionIndexRuntime_Simple_KeyboardSettings), SIGNAL(triggered()),
     924    connect(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings), SIGNAL(triggered()),
    925925            this, SLOT(sltShowKeyboardSettings()));
    926     connect(gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration), SIGNAL(toggled(bool)),
     926    connect(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration), SIGNAL(toggled(bool)),
    927927            this, SLOT(sltToggleMouseIntegration(bool)));
    928     connect(gActionPool->action(UIActionIndexRuntime_Simple_TypeCAD), SIGNAL(triggered()),
     928    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCAD), SIGNAL(triggered()),
    929929            this, SLOT(sltTypeCAD()));
    930930#ifdef Q_WS_X11
    931     connect(gActionPool->action(UIActionIndexRuntime_Simple_TypeCABS), SIGNAL(triggered()),
     931    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCABS), SIGNAL(triggered()),
    932932            this, SLOT(sltTypeCABS()));
    933933#endif
    934     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Pause), SIGNAL(toggled(bool)),
     934    connect(gActionPool->action(UIActionIndexRT_M_Machine_T_Pause), SIGNAL(toggled(bool)),
    935935            this, SLOT(sltPause(bool)));
    936     connect(gActionPool->action(UIActionIndexRuntime_Simple_Reset), SIGNAL(triggered()),
     936    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_Reset), SIGNAL(triggered()),
    937937            this, SLOT(sltReset()));
    938     connect(gActionPool->action(UIActionIndexRuntime_Simple_Save), SIGNAL(triggered()),
     938    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_Save), SIGNAL(triggered()),
    939939            this, SLOT(sltSaveState()));
    940     connect(gActionPool->action(UIActionIndexRuntime_Simple_Shutdown), SIGNAL(triggered()),
     940    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_Shutdown), SIGNAL(triggered()),
    941941            this, SLOT(sltShutdown()));
    942     connect(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff), SIGNAL(triggered()),
     942    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_PowerOff), SIGNAL(triggered()),
    943943            this, SLOT(sltPowerOff()));
    944     connect(gActionPool->action(UIActionIndexRuntime_Simple_Close), SIGNAL(triggered()),
     944    connect(gActionPool->action(UIActionIndexRT_M_Machine_S_Close), SIGNAL(triggered()),
    945945            this, SLOT(sltClose()));
    946946
    947947    /* "View" actions connections: */
    948     connect(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize), SIGNAL(toggled(bool)),
     948    connect(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize), SIGNAL(toggled(bool)),
    949949            this, SLOT(sltToggleGuestAutoresize(bool)));
    950     connect(gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow), SIGNAL(triggered()),
     950    connect(gActionPool->action(UIActionIndexRT_M_View_S_AdjustWindow), SIGNAL(triggered()),
    951951            this, SLOT(sltAdjustWindow()));
    952952
    953953    /* "Devices" actions connections: */
    954     connect(gActionPool->action(UIActionIndexRuntime_Simple_StorageSettings), SIGNAL(triggered()),
     954    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings), SIGNAL(triggered()),
    955955            this, SLOT(sltOpenStorageSettingsDialog()));
    956     connect(gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices)->menu(), SIGNAL(aboutToShow()),
     956    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices)->menu(), SIGNAL(aboutToShow()),
    957957            this, SLOT(sltPrepareStorageMenu()));
    958     connect(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->menu(), SIGNAL(aboutToShow()),
     958    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices)->menu(), SIGNAL(aboutToShow()),
    959959            this, SLOT(sltPrepareStorageMenu()));
    960     connect(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu(), SIGNAL(aboutToShow()),
     960    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices)->menu(), SIGNAL(aboutToShow()),
    961961            this, SLOT(sltPrepareUSBMenu()));
    962     connect(gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->menu(), SIGNAL(aboutToShow()),
     962    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams)->menu(), SIGNAL(aboutToShow()),
    963963            this, SLOT(sltPrepareWebCamMenu()));
    964     connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu(), SIGNAL(aboutToShow()),
     964    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedClipboard)->menu(), SIGNAL(aboutToShow()),
    965965            this, SLOT(sltPrepareSharedClipboardMenu()));
    966     connect(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu(), SIGNAL(aboutToShow()),
     966    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_DragAndDrop)->menu(), SIGNAL(aboutToShow()),
    967967            this, SLOT(sltPrepareDragAndDropMenu()));
    968     connect(gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu(), SIGNAL(aboutToShow()),
     968    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_Network)->menu(), SIGNAL(aboutToShow()),
    969969            this, SLOT(sltPrepareNetworkMenu()));
    970     connect(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings), SIGNAL(triggered()),
     970    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings), SIGNAL(triggered()),
    971971            this, SLOT(sltOpenNetworkAdaptersDialog()));
    972     connect(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings), SIGNAL(triggered()),
     972    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings), SIGNAL(triggered()),
    973973            this, SLOT(sltOpenSharedFoldersDialog()));
    974     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
     974    connect(gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer), SIGNAL(toggled(bool)),
    975975            this, SLOT(sltToggleVRDE(bool)));
    976     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture), SIGNAL(toggled(bool)),
     976    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start), SIGNAL(toggled(bool)),
    977977            this, SLOT(sltToggleVideoCapture(bool)));
    978     connect(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings), SIGNAL(triggered()),
     978    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings), SIGNAL(triggered()),
    979979            this, SLOT(sltOpenVideoCaptureOptions()));
    980     connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
     980    connect(gActionPool->action(UIActionIndexRT_M_Devices_S_InstallGuestTools), SIGNAL(triggered()),
    981981            this, SLOT(sltInstallGuestAdditions()));
    982982
    983983#ifdef VBOX_WITH_DEBUGGER_GUI
    984984    /* "Debug" actions connections: */
    985     connect(gActionPool->action(UIActionIndexRuntime_Menu_Debug)->menu(), SIGNAL(aboutToShow()),
     985    connect(gActionPool->action(UIActionIndexRT_M_Debug)->menu(), SIGNAL(aboutToShow()),
    986986            this, SLOT(sltPrepareDebugMenu()));
    987     connect(gActionPool->action(UIActionIndexRuntime_Simple_Statistics), SIGNAL(triggered()),
     987    connect(gActionPool->action(UIActionIndexRT_M_Debug_S_ShowStatistics), SIGNAL(triggered()),
    988988            this, SLOT(sltShowDebugStatistics()));
    989     connect(gActionPool->action(UIActionIndexRuntime_Simple_CommandLine), SIGNAL(triggered()),
     989    connect(gActionPool->action(UIActionIndexRT_M_Debug_S_ShowCommandLine), SIGNAL(triggered()),
    990990            this, SLOT(sltShowDebugCommandLine()));
    991     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Logging), SIGNAL(toggled(bool)),
     991    connect(gActionPool->action(UIActionIndexRT_M_Debug_T_Logging), SIGNAL(toggled(bool)),
    992992            this, SLOT(sltLoggingToggled(bool)));
    993993    connect(gActionPool->action(UIActionIndex_Simple_LogDialog), SIGNAL(triggered()),
    … …  
    10371037void UIMachineLogic::prepareDock()
    10381038{
    1039     QMenu *pDockMenu = gActionPool->action(UIActionIndexRuntime_Menu_Dock)->menu();
     1039    QMenu *pDockMenu = gActionPool->action(UIActionIndexRT_M_Dock)->menu();
    10401040
    10411041    /* Add all VM menu entries to the dock menu. Leave out close and stuff like
    10421042     * this. */
    1043     QList<QAction*> actions = gActionPool->action(UIActionIndexRuntime_Menu_Machine)->menu()->actions();
     1043    QList<QAction*> actions = gActionPool->action(UIActionIndexRT_M_Machine)->menu()->actions();
    10441044    for (int i=0; i < actions.size(); ++i)
    10451045        if (actions.at(i)->menuRole() == QAction::NoRole)
    … …  
    10471047    pDockMenu->addSeparator();
    10481048
    1049     QMenu *pDockSettingsMenu = gActionPool->action(UIActionIndexRuntime_Menu_DockSettings)->menu();
     1049    QMenu *pDockSettingsMenu = gActionPool->action(UIActionIndexRT_M_Dock_M_DockSettings)->menu();
    10501050    QActionGroup *pDockPreviewModeGroup = new QActionGroup(this);
    1051     QAction *pDockDisablePreview = gActionPool->action(UIActionIndexRuntime_Toggle_DockDisableMonitor);
     1051    QAction *pDockDisablePreview = gActionPool->action(UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor);
    10521052    pDockPreviewModeGroup->addAction(pDockDisablePreview);
    1053     QAction *pDockEnablePreviewMonitor = gActionPool->action(UIActionIndexRuntime_Toggle_DockPreviewMonitor);
     1053    QAction *pDockEnablePreviewMonitor = gActionPool->action(UIActionIndexRT_M_Dock_M_DockSettings_T_PreviewMonitor);
    10541054    pDockPreviewModeGroup->addAction(pDockEnablePreviewMonitor);
    10551055    pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions());
    … …  
    11821182{
    11831183    /* Get corresponding menu: */
    1184     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_Machine)->menu();
     1184    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_Machine)->menu();
    11851185    AssertPtrReturnVoid(pMenu);
    11861186    /* Clear contents: */
    … …  
    11941194    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_SettingsDialog)
    11951195    {
    1196         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog));
     1196        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Settings));
    11971197        fSeparator1 = true;
    11981198    }
    11991199    else
    1200         gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog)->setEnabled(false);
     1200        gActionPool->action(UIActionIndexRT_M_Machine_S_Settings)->setEnabled(false);
    12011201
    12021202    /* 'Take Snapshot' action: */
    … …  
    12041204        uisession()->isSnapshotOperationsAllowed())
    12051205    {
    1206         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot));
     1206        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeSnapshot));
    12071207        fSeparator1 = true;
    12081208    }
    12091209    else
    1210         gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot)->setEnabled(false);
     1210        gActionPool->action(UIActionIndexRT_M_Machine_S_TakeSnapshot)->setEnabled(false);
    12111211
    12121212    /* 'Take Screenshot' action: */
    12131213    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_TakeScreenshot)
    12141214    {
    1215         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeScreenshot));
     1215        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TakeScreenshot));
    12161216        fSeparator1 = true;
    12171217    }
    12181218    else
    1219         gActionPool->action(UIActionIndexRuntime_Simple_TakeScreenshot)->setEnabled(false);
     1219        gActionPool->action(UIActionIndexRT_M_Machine_S_TakeScreenshot)->setEnabled(false);
    12201220
    12211221    /* 'Information Dialog' action: */
    12221222    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_InformationDialog)
    12231223    {
    1224         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InformationDialog));
     1224        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_ShowInformation));
    12251225        fSeparator1 = true;
    12261226    }
    12271227    else
    1228         gActionPool->action(UIActionIndexRuntime_Simple_InformationDialog)->setEnabled(false);
     1228        gActionPool->action(UIActionIndexRT_M_Machine_S_ShowInformation)->setEnabled(false);
    12291229
    12301230    /* Separator #1: */
    … …  
    12391239    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_KeyboardSettings)
    12401240    {
    1241 //        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_KeyboardSettings));
     1241//        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
    12421242//        fSeparator2 = true;
    12431243    }
    12441244    else
    1245         gActionPool->action(UIActionIndexRuntime_Simple_KeyboardSettings)->setEnabled(false);
     1245        gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings)->setEnabled(false);
    12461246
    12471247    /* 'Mouse Integration' action: */
    12481248    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_MouseIntegration)
    12491249    {
    1250         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration));
     1250        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration));
    12511251        fSeparator2 = true;
    12521252    }
    12531253    else
    1254         gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration)->setEnabled(false);
     1254        gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration)->setEnabled(false);
    12551255
    12561256    /* Separator #2: */
    … …  
    12651265    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_TypeCAD)
    12661266    {
    1267         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TypeCAD));
     1267        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCAD));
    12681268        fSeparator3 = true;
    12691269    }
    12701270    else
    1271         gActionPool->action(UIActionIndexRuntime_Simple_TypeCAD)->setEnabled(false);
     1271        gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCAD)->setEnabled(false);
    12721272
    12731273#ifdef Q_WS_X11
    … …  
    12751275    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_TypeCABS)
    12761276    {
    1277         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TypeCABS));
     1277        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCABS));
    12781278        fSeparator3 = true;
    12791279    }
    12801280    else
    1281         gActionPool->action(UIActionIndexRuntime_Simple_TypeCABS)->setEnabled(false);
     1281        gActionPool->action(UIActionIndexRT_M_Machine_S_TypeCABS)->setEnabled(false);
    12821282#endif /* Q_WS_X11 */
    12831283
    … …  
    12931293    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_Pause)
    12941294    {
    1295         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Pause));
     1295        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_T_Pause));
    12961296        fSeparator4 = true;
    12971297    }
    12981298    else
    1299         gActionPool->action(UIActionIndexRuntime_Toggle_Pause)->setEnabled(false);
     1299        gActionPool->action(UIActionIndexRT_M_Machine_T_Pause)->setEnabled(false);
    13001300
    13011301    /* 'Reset' action: */
    13021302    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_Reset)
    13031303    {
    1304         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Reset));
     1304        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Reset));
    13051305        fSeparator4 = true;
    13061306    }
    13071307    else
    1308         gActionPool->action(UIActionIndexRuntime_Simple_Reset)->setEnabled(false);
     1308        gActionPool->action(UIActionIndexRT_M_Machine_S_Reset)->setEnabled(false);
    13091309
    13101310    /* 'Save' action: */
    13111311    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_SaveState)
    13121312    {
    1313 //        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Save));
     1313//        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Save));
    13141314//        fSeparator4 = true;
    13151315    }
    13161316    else
    1317         gActionPool->action(UIActionIndexRuntime_Simple_Save)->setEnabled(false);
     1317        gActionPool->action(UIActionIndexRT_M_Machine_S_Save)->setEnabled(false);
    13181318
    13191319    /* 'Shutdown' action: */
    13201320    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_Shutdown)
    13211321    {
    1322         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Shutdown));
     1322        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Shutdown));
    13231323        fSeparator4 = true;
    13241324    }
    13251325    else
    1326         gActionPool->action(UIActionIndexRuntime_Simple_Shutdown)->setEnabled(false);
     1326        gActionPool->action(UIActionIndexRT_M_Machine_S_Shutdown)->setEnabled(false);
    13271327
    13281328    /* 'PowerOff' action: */
    13291329    if (uisession()->allowedActionsMenuMachine() & RuntimeMenuMachineActionType_PowerOff)
    13301330    {
    1331 //        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
     1331//        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_PowerOff));
    13321332//        fSeparator4 = true;
    13331333    }
    13341334    else
    1335         gActionPool->action(UIActionIndexRuntime_Simple_PowerOff)->setEnabled(false);
     1335        gActionPool->action(UIActionIndexRT_M_Machine_S_PowerOff)->setEnabled(false);
    13361336
    13371337#ifndef Q_WS_MAC
    … …  
    13431343
    13441344    /* Close action: */
    1345     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Close));
     1345    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_S_Close));
    13461346    if (uisession()->isAllCloseActionsRestricted())
    1347         gActionPool->action(UIActionIndexRuntime_Simple_Close)->setEnabled(false);
     1347        gActionPool->action(UIActionIndexRT_M_Machine_S_Close)->setEnabled(false);
    13481348}
    13491349
    … …  
    13511351{
    13521352    /* Get corresponding menu: */
    1353     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
     1353    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_View)->menu();
    13541354    AssertPtrReturnVoid(pMenu);
    13551355    /* Clear contents: */
    … …  
    13651365
    13661366    /* 'Fullscreen' action: */
    1367     gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen)->setEnabled(fIsAllowedFullscreen);
     1367    gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen)->setEnabled(fIsAllowedFullscreen);
    13681368    if (fIsAllowedFullscreen)
    1369         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen));
     1369        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen));
    13701370
    13711371    /* 'Seamless' action: */
    1372     gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(fIsAllowedSeamless);
     1372    gActionPool->action(UIActionIndexRT_M_View_T_Seamless)->setEnabled(fIsAllowedSeamless);
    13731373    if (fIsAllowedSeamless)
    1374         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless));
     1374        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Seamless));
    13751375
    13761376    /* 'Scale' action: */
    1377     gActionPool->action(UIActionIndexRuntime_Toggle_Scale)->setEnabled(fIsAllowedScale);
     1377    gActionPool->action(UIActionIndexRT_M_View_T_Scale)->setEnabled(fIsAllowedScale);
    13781378    if (fIsAllowedScale)
    1379         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Scale));
     1379        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_T_Scale));
    13801380
    13811381    /* Visual representation mode separator: */
    … …  
    13871387{
    13881388    /* Get corresponding menu: */
    1389     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_Devices)->menu();
     1389    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_Devices)->menu();
    13901390    AssertPtrReturnVoid(pMenu);
    13911391    /* Clear contents: */
    … …  
    13991399    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_OpticalDevices)
    14001400    {
    1401         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices));
     1401        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices));
    14021402        fSeparator1 = true;
    14031403    }
    14041404    else
    1405         gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices)->setEnabled(false);
     1405        gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices)->setEnabled(false);
    14061406
    14071407    /* 'Floppy Devices' submenu: */
    14081408    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_FloppyDevices)
    14091409    {
    1410         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices));
     1410        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices));
    14111411        fSeparator1 = true;
    14121412    }
    14131413    else
    1414         gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->setEnabled(false);
     1414        gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices)->setEnabled(false);
    14151415
    14161416    /* 'USB Devices' submenu: */
    14171417    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_USBDevices)
    14181418    {
    1419         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_USBDevices));
     1419        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices));
    14201420        fSeparator1 = true;
    14211421    }
    14221422    else
    1423         gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->setEnabled(false);
     1423        gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices)->setEnabled(false);
    14241424
    14251425    /* 'Web Cams' submenu: */
    14261426    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_WebCams)
    14271427    {
    1428         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_WebCams));
     1428        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams));
    14291429        fSeparator1 = true;
    14301430    }
    14311431    else
    1432         gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->setEnabled(false);
     1432        gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams)->setEnabled(false);
    14331433
    14341434    /* 'Shared Clipboard' submenu: */
    14351435    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedClipboard)
    14361436    {
    1437         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard));
     1437        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedClipboard));
    14381438        fSeparator1 = true;
    14391439    }
    14401440    else
    1441         gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->setEnabled(false);
     1441        gActionPool->action(UIActionIndexRT_M_Devices_M_SharedClipboard)->setEnabled(false);
    14421442
    14431443    /* 'Drag&Drop' submenu: */
    14441444    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_DragAndDrop)
    14451445    {
    1446         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop));
     1446        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_DragAndDrop));
    14471447        fSeparator1 = true;
    14481448    }
    14491449    else
    1450         gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->setEnabled(false);
     1450        gActionPool->action(UIActionIndexRT_M_Devices_M_DragAndDrop)->setEnabled(false);
    14511451
    14521452    /* 'Network' submenu: */
    14531453    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_Network)
    14541454    {
    1455         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_Network));
     1455        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_Network));
    14561456        fSeparator1 = true;
    14571457    }
    14581458    else
    1459         gActionPool->action(UIActionIndexRuntime_Menu_Network)->setEnabled(false);
     1459        gActionPool->action(UIActionIndexRT_M_Devices_M_Network)->setEnabled(false);
    14601460    updateMenuDevicesNetwork();
    14611461
    … …  
    14631463    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedFoldersSettings)
    14641464    {
    1465         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
     1465        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
    14661466        fSeparator1 = true;
    14671467    }
    14681468    else
    1469         gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings)->setEnabled(false);
     1469        gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings)->setEnabled(false);
    14701470
    14711471    /* Separator #1: */
    … …  
    14801480    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_VRDEServer)
    14811481    {
    1482         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
     1482        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer));
    14831483        if (!uisession()->isExtensionPackUsable())
    1484             gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)->setEnabled(false);
     1484            gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setEnabled(false);
    14851485        fSeparator2 = true;
    14861486    }
    14871487    else
    1488         gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)->setEnabled(false);
     1488        gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setEnabled(false);
    14891489
    14901490    /* 'Video Capture' action: */
    14911491    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_VideoCapture)
    14921492    {
    1493         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
     1493        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start));
    14941494        fSeparator2 = true;
    14951495    }
    14961496    else
    1497         gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture)->setEnabled(false);
     1497        gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start)->setEnabled(false);
    14981498
    14991499    /* Separator #2: */
    … …  
    15041504    /* Install Guest Tools action: */
    15051505    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_InstallGuestTools)
    1506         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
    1507     else
    1508         gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)->setEnabled(false);
     1506        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_S_InstallGuestTools));
     1507    else
     1508        gActionPool->action(UIActionIndexRT_M_Devices_S_InstallGuestTools)->setEnabled(false);
    15091509}
    15101510
    … …  
    15121512{
    15131513    /* Get corresponding menu: */
    1514     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu();
     1514    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_Network)->menu();
    15151515    AssertPtrReturnVoid(pMenu);
    15161516    /* Clear contents: */
    … …  
    15201520    /* 'Network Settings' action: */
    15211521    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_NetworkSettings)
    1522         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings));
    1523     else
    1524         gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setEnabled(false);
     1522        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings));
     1523    else
     1524        gActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings)->setEnabled(false);
    15251525}
    15261526
    … …  
    15291529{
    15301530    /* Get corresponding menu: */
    1531     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_Debug)->menu();
     1531    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_Debug)->menu();
    15321532    AssertPtrReturnVoid(pMenu);
    15331533    /* Clear contents: */
    … …  
    15371537    /* 'Statistics' action: */
    15381538    if (uisession()->allowedActionsMenuDebugger() & RuntimeMenuDebuggerActionType_Statistics)
    1539         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Statistics));
    1540     else
    1541         gActionPool->action(UIActionIndexRuntime_Simple_Statistics)->setEnabled(false);
     1539        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Debug_S_ShowStatistics));
     1540    else
     1541        gActionPool->action(UIActionIndexRT_M_Debug_S_ShowStatistics)->setEnabled(false);
    15421542
    15431543    /* 'Command Line' action: */
    15441544    if (uisession()->allowedActionsMenuDebugger() & RuntimeMenuDebuggerActionType_CommandLine)
    1545         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_CommandLine));
    1546     else
    1547         gActionPool->action(UIActionIndexRuntime_Simple_CommandLine)->setEnabled(false);
     1545        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Debug_S_ShowCommandLine));
     1546    else
     1547        gActionPool->action(UIActionIndexRT_M_Debug_S_ShowCommandLine)->setEnabled(false);
    15481548
    15491549    /* 'Logging' action: */
    15501550    if (uisession()->allowedActionsMenuDebugger() & RuntimeMenuDebuggerActionType_Logging)
    1551         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_Logging));
    1552     else
    1553         gActionPool->action(UIActionIndexRuntime_Toggle_Logging)->setEnabled(false);
     1551        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Debug_T_Logging));
     1552    else
     1553        gActionPool->action(UIActionIndexRT_M_Debug_T_Logging)->setEnabled(false);
    15541554
    15551555    /* 'Log Dialog' action: */
    … …  
    20972097
    20982098    /* Determine device-type: */
    2099     const QMenu *pOpticalDevicesMenu = gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices)->menu();
    2100     const QMenu *pFloppyDevicesMenu = gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices)->menu();
     2099    const QMenu *pOpticalDevicesMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices)->menu();
     2100    const QMenu *pFloppyDevicesMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices)->menu();
    21012101    const KDeviceType deviceType = pMenu == pOpticalDevicesMenu ? KDeviceType_DVD :
    21022102                                   pMenu == pFloppyDevicesMenu  ? KDeviceType_Floppy :
    … …  
    21662166    /* Get and check the sender menu object: */
    21672167    QMenu *pMenu = qobject_cast<QMenu*>(sender());
    2168     QMenu *pUSBDevicesMenu = gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->menu();
     2168    QMenu *pUSBDevicesMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices)->menu();
    21692169    AssertMsg(pMenu == pUSBDevicesMenu, ("This slot should only be called on hovering USB menu!\n"));
    21702170    Q_UNUSED(pUSBDevicesMenu);
    … …  
    22352235    /* Get and check the sender menu object: */
    22362236    QMenu *pMenu = qobject_cast<QMenu*>(sender());
    2237     QMenu *pWebCamMenu = gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->menu();
     2237    QMenu *pWebCamMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams)->menu();
    22382238    AssertReturnVoid(pMenu == pWebCamMenu); Q_UNUSED(pWebCamMenu);
    22392239
    … …  
    23702370    /* Get and check the sender menu object: */
    23712371    QMenu *pMenu = qobject_cast<QMenu*>(sender());
    2372     QMenu *pSharedClipboardMenu = gActionPool->action(UIActionIndexRuntime_Menu_SharedClipboard)->menu();
     2372    QMenu *pSharedClipboardMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_SharedClipboard)->menu();
    23732373    AssertMsg(pMenu == pSharedClipboardMenu, ("This slot should only be called on hovering Shared Clipboard menu!\n"));
    23742374    Q_UNUSED(pSharedClipboardMenu);
    … …  
    24082408    /* Get and check the sender menu object: */
    24092409    QMenu *pMenu = qobject_cast<QMenu*>(sender());
    2410     QMenu *pDragAndDropMenu = gActionPool->action(UIActionIndexRuntime_Menu_DragAndDrop)->menu();
     2410    QMenu *pDragAndDropMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_DragAndDrop)->menu();
    24112411    AssertMsg(pMenu == pDragAndDropMenu, ("This slot should only be called on hovering Drag'n'drop menu!\n"));
    24122412    Q_UNUSED(pDragAndDropMenu);
    … …  
    24402440    /* Get and check 'the sender' menu object: */
    24412441    QMenu *pMenu = qobject_cast<QMenu*>(sender());
    2442     QMenu *pNetworkMenu = gActionPool->action(UIActionIndexRuntime_Menu_Network)->menu();
     2442    QMenu *pNetworkMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_Network)->menu();
    24432443    AssertReturnVoid(pMenu == pNetworkMenu);
    24442444    Q_UNUSED(pNetworkMenu);
    … …  
    26742674        }
    26752675    }
    2676     if (fEnabled != gActionPool->action(UIActionIndexRuntime_Toggle_Logging)->isEnabled())
    2677         gActionPool->action(UIActionIndexRuntime_Toggle_Logging)->setEnabled(fEnabled);
    2678     if (fChecked != gActionPool->action(UIActionIndexRuntime_Toggle_Logging)->isChecked())
    2679         gActionPool->action(UIActionIndexRuntime_Toggle_Logging)->setChecked(fChecked);
     2676    if (fEnabled != gActionPool->action(UIActionIndexRT_M_Debug_T_Logging)->isEnabled())
     2677        gActionPool->action(UIActionIndexRT_M_Debug_T_Logging)->setEnabled(fEnabled);
     2678    if (fChecked != gActionPool->action(UIActionIndexRT_M_Debug_T_Logging)->isChecked())
     2679        gActionPool->action(UIActionIndexRT_M_Debug_T_Logging)->setChecked(fChecked);
    26802680}
    26812681
    … …  
    27242724    if (!machine.isNull())
    27252725    {
    2726         bool fEnabled = pAction != gActionPool->action(UIActionIndexRuntime_Toggle_DockDisableMonitor);
     2726        bool fEnabled = pAction != gActionPool->action(UIActionIndexRT_M_Dock_M_DockSettings_T_DisableMonitor);
    27272727        gEDataManager->setRealtimeDockIconUpdateEnabled(fEnabled, vboxGlobal().managedVMUuid());
    27282728        updateDockOverlay();
    … …  
    29412941            {
    29422942                m_pDbgGuiVT->pfnSetParent(m_pDbgGui, activeMachineWindow());
    2943                 m_pDbgGuiVT->pfnSetMenu(m_pDbgGui, gActionPool->action(UIActionIndexRuntime_Menu_Debug));
     2943                m_pDbgGuiVT->pfnSetMenu(m_pDbgGui, gActionPool->action(UIActionIndexRT_M_Debug));
    29442944                dbgAdjustRelativePos();
    29452945                return true;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp

    r51679 r52133  
    359359
    360360    /* Get the list of all view-menu actions: */
    361     QList<QAction*> viewMenuActions = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu()->actions();
     361    QList<QAction*> viewMenuActions = gActionPool->action(UIActionIndexRT_M_View)->menu()->actions();
    362362    /* Get the list of all view related actions: */
    363363    QList<QAction*> viewActions;

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

    r52132 r52133  
    760760    bool fIsVRDEServerAvailable = !server.isNull();
    761761    /* Show/Hide VRDE action depending on VRDE server availability status: */
    762     gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)->setVisible(fIsVRDEServerAvailable);
     762    gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setVisible(fIsVRDEServerAvailable);
    763763    /* Check/Uncheck VRDE action depending on VRDE server activity status: */
    764764    if (fIsVRDEServerAvailable)
    765         gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)->setChecked(server.GetEnabled());
     765        gActionPool->action(UIActionIndexRT_M_Devices_T_VRDEServer)->setChecked(server.GetEnabled());
    766766    /* Notify listeners about VRDE change: */
    767767    emit sigVRDEChange();
    … …  
    773773    const CMachine machine = session().GetMachine();
    774774    /* Check/Uncheck Video Capture action depending on feature status: */
    775     gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture)->setChecked(machine.GetVideoCaptureEnabled());
     775    gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start)->setChecked(machine.GetVideoCaptureEnabled());
    776776    /* Notify listeners about Video Capture change: */
    777777    emit sigVideoCaptureChange();
    … …  
    990990                ++iDevicesCountFD;
    991991        }
    992         QAction *pOpticalDevicesMenu = gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices);
    993         QAction *pFloppyDevicesMenu = gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices);
     992        QAction *pOpticalDevicesMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices);
     993        QAction *pFloppyDevicesMenu = gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices);
    994994        pOpticalDevicesMenu->setData(iDevicesCountCD);
    995995        pOpticalDevicesMenu->setVisible(iDevicesCountCD);
    … …  
    10131013            }
    10141014        }
    1015         gActionPool->action(UIActionIndexRuntime_Menu_Network)->setVisible(fAtLeastOneAdapterActive);
     1015        gActionPool->action(UIActionIndexRT_M_Devices_M_Network)->setVisible(fAtLeastOneAdapterActive);
    10161016    }
    10171017
    … …  
    10221022                                 && !machine.GetUSBControllers().isEmpty()
    10231023                                 && machine.GetUSBProxyAvailable();
    1024         gActionPool->action(UIActionIndexRuntime_Menu_USBDevices)->setVisible(fUSBEnabled);
     1024        gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices)->setVisible(fUSBEnabled);
    10251025    }
    10261026
    … …  
    10301030        host.GetVideoInputDevices();
    10311031        const bool fWebCamsEnabled = host.isOk() && !machine.GetUSBControllers().isEmpty();
    1032         gActionPool->action(UIActionIndexRuntime_Menu_WebCams)->setVisible(fWebCamsEnabled);
     1032        gActionPool->action(UIActionIndexRT_M_Devices_M_WebCams)->setVisible(fWebCamsEnabled);
    10331033    }
    10341034}
    … …  
    11561156
    11571157        /* Should guest autoresize? */
    1158         QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize);
     1158        QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize);
    11591159        pGuestAutoresizeSwitch->setChecked(gEDataManager->guestScreenAutoResizeEnabled(vboxGlobal().managedVMUuid()));
    11601160
    … …  
    11681168        const bool fEnabledForMachine = gEDataManager->statusBarEnabled(vboxGlobal().managedVMUuid());
    11691169        const bool fEnabled = fEnabledGlobally && fEnabledForMachine;
    1170         QAction *pActionStatusBarSettings = gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings);
     1170        QAction *pActionStatusBarSettings = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings);
    11711171        pActionStatusBarSettings->setEnabled(fEnabled);
    1172         QAction *pActionStatusBarSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar);
     1172        QAction *pActionStatusBarSwitch = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility);
    11731173        pActionStatusBarSwitch->blockSignals(true);
    11741174        pActionStatusBarSwitch->setChecked(fEnabled);
    … …  
    12051205
    12061206        /* Remember if guest should autoresize: */
    1207         gEDataManager->setGuestScreenAutoResizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked(), vboxGlobal().managedVMUuid());
     1207        gEDataManager->setGuestScreenAutoResizeEnabled(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked(), vboxGlobal().managedVMUuid());
    12081208
    12091209#if 0 /* Disabled for now! */
    … …  
    12591259{
    12601260    /* Particularly enable/disable reconfigurable action: */
    1261     gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog)->setEnabled(m_fReconfigurable);
    1262     gActionPool->action(UIActionIndexRuntime_Simple_StorageSettings)->setEnabled(m_fReconfigurable);
    1263     gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings)->setEnabled(m_fReconfigurable);
    1264     gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings)->setEnabled(m_fReconfigurable);
    1265     gActionPool->action(UIActionIndexRuntime_Simple_NetworkSettings)->setEnabled(m_fReconfigurable);
     1261    gActionPool->action(UIActionIndexRT_M_Machine_S_Settings)->setEnabled(m_fReconfigurable);
     1262    gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings)->setEnabled(m_fReconfigurable);
     1263    gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings)->setEnabled(m_fReconfigurable);
     1264    gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings)->setEnabled(m_fReconfigurable);
     1265    gActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings)->setEnabled(m_fReconfigurable);
    12661266    /* Particularly enable/disable snapshot related action: */
    1267     gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot)->setEnabled(m_fSnapshotOperationsAllowed);
     1267    gActionPool->action(UIActionIndexRT_M_Machine_S_TakeSnapshot)->setEnabled(m_fSnapshotOperationsAllowed);
    12681268}
    12691269

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

    r52130 r52133  
    7575     * the linked key without the 'Host+' part we are adding it here. */
    7676    QString hotKey = QString("Host+%1")
    77         .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen)->text()));
     77        .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen)->text()));
    7878    Assert(!hotKey.isEmpty());
    7979
    … …  
    446446
    447447    /* Take care of view-action toggle state: */
    448     UIAction *pActionFullscreen = gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen);
     448    UIAction *pActionFullscreen = gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen);
    449449    if (!pActionFullscreen->isChecked())
    450450    {
    … …  
    462462
    463463    /* "View" actions connections: */
    464     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     464    connect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    465465            this, SLOT(sltChangeVisualStateToNormal()));
    466     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     466    connect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    467467            this, SLOT(sltChangeVisualStateToSeamless()));
    468     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     468    connect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    469469            this, SLOT(sltChangeVisualStateToScale()));
    470470}
    … …  
    608608{
    609609    /* "View" actions disconnections: */
    610     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     610    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    611611               this, SLOT(sltChangeVisualStateToNormal()));
    612     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     612    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    613613               this, SLOT(sltChangeVisualStateToSeamless()));
    614     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     614    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    615615               this, SLOT(sltChangeVisualStateToScale()));
    616616
    … …  
    622622{
    623623    /* Take care of view-action toggle state: */
    624     UIAction *pActionFullscreen = gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen);
     624    UIAction *pActionFullscreen = gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen);
    625625    if (pActionFullscreen->isChecked())
    626626    {
    … …  
    641641
    642642    /* Get corresponding menu: */
    643     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
     643    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_View)->menu();
    644644    AssertPtrReturnVoid(pMenu);
    645645

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

    r49322 r52133  
    5151#endif
    5252                    )
    53     , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked())
     53    , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
    5454{
    5555}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

    r52129 r52133  
    226226#endif /* !RT_OS_DARWIN */
    227227    connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    228             gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SLOT(trigger()));
     228            gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
    229229    connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    230             gActionPool->action(UIActionIndexRuntime_Simple_Close), SLOT(trigger()));
     230            gActionPool->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
    231231    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
    232232}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

    r52129 r52133  
    8181
    8282    /* Make sure status-bar is enabled: */
    83     const bool fEnabled = gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->isChecked();
     83    const bool fEnabled = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked();
    8484    AssertReturnVoid(fEnabled);
    8585
    8686    /* Prevent user from opening another one editor or toggle status-bar: */
    87     gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings)->setEnabled(false);
    88     gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->setEnabled(false);
     87    gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings)->setEnabled(false);
     88    gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->setEnabled(false);
    8989    /* Create status-bar editor: */
    9090    UIStatusBarEditorWindow *pStatusBarEditor = new UIStatusBarEditorWindow(activeMachineWindow());
    … …  
    106106{
    107107    /* Make sure status-bar is enabled: */
    108     const bool fEnabled = gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->isChecked();
     108    const bool fEnabled = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked();
    109109    AssertReturnVoid(fEnabled);
    110110
    111111    /* Allow user to open editor and toggle status-bar again: */
    112     gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings)->setEnabled(true);
    113     gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->setEnabled(true);
     112    gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings)->setEnabled(true);
     113    gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->setEnabled(true);
    114114}
    115115
    … …  
    134134
    135135    /* Add default contents: */
    136     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow));
    137     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize));
     136    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_S_AdjustWindow));
     137    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize));
    138138    pMenu->addSeparator();
    139139
    … …  
    233233    AssertMsg(pMenu, ("This slot should be called only on Hard Disks menu show!\n"));
    234234    pMenu->clear();
    235     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_StorageSettings));
     235    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings));
    236236}
    237237
    … …  
    241241    AssertMsg(menu, ("This slot should be called only on Shared Folders menu show!\n"));
    242242    menu->clear();
    243     menu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersSettings));
     243    menu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
    244244}
    245245
    … …  
    249249    AssertMsg(pMenu, ("This slot should be called only on Video Capture menu show!\n"));
    250250    pMenu->clear();
    251     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_VideoCaptureSettings));
    252     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VideoCapture));
     251    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings));
     252    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start));
    253253}
    254254
    … …  
    258258    AssertMsg(pMenu, ("This slot should be called only on Keyboard menu show!\n"));
    259259    pMenu->clear();
    260     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_KeyboardSettings));
     260    pMenu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
    261261}
    262262
    … …  
    266266    AssertMsg(menu, ("This slot should be called only on Mouse Integration Menu show!\n"));
    267267    menu->clear();
    268     menu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration));
     268    menu->addAction(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration));
    269269}
    270270
    … …  
    275275
    276276    /* "View" actions connections: */
    277     connect(gActionPool->action(UIActionIndexRuntime_Menu_ViewPopup)->menu(), SIGNAL(aboutToShow()),
     277    connect(gActionPool->action(UIActionIndexRT_M_ViewPopup)->menu(), SIGNAL(aboutToShow()),
    278278            this, SLOT(sltPrepareMenuViewPopup()));
    279     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     279    connect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    280280            this, SLOT(sltChangeVisualStateToFullscreen()));
    281     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     281    connect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    282282            this, SLOT(sltChangeVisualStateToSeamless()));
    283     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     283    connect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    284284            this, SLOT(sltChangeVisualStateToScale()));
    285     connect(gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings), SIGNAL(triggered(bool)),
     285    connect(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
    286286            this, SLOT(sltOpenStatusBarSettings()));
    287     connect(gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar), SIGNAL(triggered(bool)),
     287    connect(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
    288288            this, SLOT(sltToggleStatusBar()));
    289289
    290290    /* "Device" actions connections: */
    291     connect(gActionPool->action(UIActionIndexRuntime_Menu_HardDisks)->menu(), SIGNAL(aboutToShow()),
     291    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives)->menu(), SIGNAL(aboutToShow()),
    292292            this, SLOT(sltPrepareHardDisksMenu()));
    293     connect(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)->menu(), SIGNAL(aboutToShow()),
     293    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders)->menu(), SIGNAL(aboutToShow()),
    294294            this, SLOT(sltPrepareSharedFoldersMenu()));
    295     connect(gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture)->menu(), SIGNAL(aboutToShow()),
     295    connect(gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture)->menu(), SIGNAL(aboutToShow()),
    296296            this, SLOT(sltPrepareVideoCaptureMenu()));
    297     connect(gActionPool->action(UIActionIndexRuntime_Menu_Keyboard)->menu(), SIGNAL(aboutToShow()),
     297    connect(gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard)->menu(), SIGNAL(aboutToShow()),
    298298            this, SLOT(sltPrepareKeyboardMenu()));
    299     connect(gActionPool->action(UIActionIndexRuntime_Menu_MouseIntegration)->menu(), SIGNAL(aboutToShow()),
     299    connect(gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse)->menu(), SIGNAL(aboutToShow()),
    300300            this, SLOT(sltPrepareMouseIntegrationMenu()));
    301301}
    … …  
    343343{
    344344    /* "View" actions disconnections: */
    345     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     345    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    346346               this, SLOT(sltChangeVisualStateToFullscreen()));
    347     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     347    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    348348               this, SLOT(sltChangeVisualStateToSeamless()));
    349     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     349    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    350350               this, SLOT(sltChangeVisualStateToScale()));
    351     disconnect(gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings), SIGNAL(triggered(bool)),
     351    disconnect(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings), SIGNAL(triggered(bool)),
    352352               this, SLOT(sltOpenStatusBarSettings()));
    353     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar), SIGNAL(triggered(bool)),
     353    disconnect(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility), SIGNAL(triggered(bool)),
    354354               this, SLOT(sltToggleStatusBar()));
    355355
    … …  
    364364
    365365    /* Get corresponding menu: */
    366     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
     366    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_View)->menu();
    367367    AssertPtrReturnVoid(pMenu);
    368368
    … …  
    373373    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_AdjustWindow)
    374374    {
    375         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow));
     375        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_S_AdjustWindow));
    376376        fSeparator1 = true;
    377377    }
    378378    else
    379         gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow)->setEnabled(false);
     379        gActionPool->action(UIActionIndexRT_M_View_S_AdjustWindow)->setEnabled(false);
    380380
    381381    /* 'Guest Autoresize' action: */
    382382    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_GuestAutoresize)
    383383    {
    384         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize));
     384        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize));
    385385        fSeparator1 = true;
    386386    }
    387387    else
    388         gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->setEnabled(false);
     388        gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize)->setEnabled(false);
    389389
    390390    /* Separator #1: */
    … …  
    394394    /* 'Status Bar' submenu: */
    395395    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_StatusBar)
    396         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Menu_StatusBar));
     396        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar));
    397397    else
    398         gActionPool->action(UIActionIndexRuntime_Menu_StatusBar)->setEnabled(false);
     398        gActionPool->action(UIActionIndexRT_M_View_M_StatusBar)->setEnabled(false);
    399399    updateMenuViewStatusBar();
    400400}
    … …  
    403403{
    404404    /* Get corresponding menu: */
    405     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_StatusBar)->menu();
     405    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar)->menu();
    406406    AssertPtrReturnVoid(pMenu);
    407407    /* Clear contents: */
    … …  
    410410    /* 'Status Bar Settings' action: */
    411411    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_StatusBarSettings)
    412         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings));
     412        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings));
    413413    else
    414         gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings)->setEnabled(false);
     414        gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings)->setEnabled(false);
    415415
    416416    /* 'Toggle Status Bar' action: */
    417417    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_ToggleStatusBar)
    418         pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar));
     418        pMenu->addAction(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility));
    419419    else
    420         gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->setEnabled(false);
    421 }
    422 
     420        gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->setEnabled(false);
     421}
     422

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

    r51558 r52133  
    4848#endif
    4949                    )
    50     , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked())
     50    , m_bIsGuestAutoresizeEnabled(gActionPool->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked())
    5151{
    5252    /* Resend the last resize hint if there was a fullscreen or

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

    r52130 r52133  
    120120    const bool fEnabled = gEDataManager->statusBarEnabled(vboxGlobal().managedVMUuid());
    121121    /* Update settings action 'enable' state: */
    122     QAction *pActionStatusBarSettings = gActionPool->action(UIActionIndexRuntime_Simple_StatusBarSettings);
     122    QAction *pActionStatusBarSettings = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_S_Settings);
    123123    pActionStatusBarSettings->setEnabled(fEnabled);
    124124    /* Update switch action 'checked' state: */
    125     QAction *pActionStatusBarSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar);
     125    QAction *pActionStatusBarSwitch = gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility);
    126126    pActionStatusBarSwitch->blockSignals(true);
    127127    pActionStatusBarSwitch->setChecked(fEnabled);
    … …  
    139139{
    140140    /* Raise action's context-menu: */
    141     gActionPool->action(UIActionIndexRuntime_Menu_StatusBar)->menu()->exec(statusBar()->mapToGlobal(position));
     141    gActionPool->action(UIActionIndexRT_M_View_M_StatusBar)->menu()->exec(statusBar()->mapToGlobal(position));
    142142}
    143143
    … …  
    148148    switch (indicatorType)
    149149    {
    150         case IndicatorType_HardDisks:     pAction = gActionPool->action(UIActionIndexRuntime_Menu_HardDisks);        break;
    151         case IndicatorType_OpticalDisks:  pAction = gActionPool->action(UIActionIndexRuntime_Menu_OpticalDevices);   break;
    152         case IndicatorType_FloppyDisks:   pAction = gActionPool->action(UIActionIndexRuntime_Menu_FloppyDevices);    break;
    153         case IndicatorType_USB:           pAction = gActionPool->action(UIActionIndexRuntime_Menu_USBDevices);       break;
    154         case IndicatorType_Network:       pAction = gActionPool->action(UIActionIndexRuntime_Menu_Network);          break;
    155         case IndicatorType_SharedFolders: pAction = gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders);    break;
    156         case IndicatorType_Display:       pAction = gActionPool->action(UIActionIndexRuntime_Menu_ViewPopup);        break;
    157         case IndicatorType_VideoCapture:  pAction = gActionPool->action(UIActionIndexRuntime_Menu_VideoCapture);     break;
    158         case IndicatorType_Mouse:         pAction = gActionPool->action(UIActionIndexRuntime_Menu_MouseIntegration); break;
    159         case IndicatorType_Keyboard:      pAction = gActionPool->action(UIActionIndexRuntime_Menu_Keyboard);         break;
     150        case IndicatorType_HardDisks:     pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives);        break;
     151        case IndicatorType_OpticalDisks:  pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_OpticalDevices);   break;
     152        case IndicatorType_FloppyDisks:   pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_FloppyDevices);    break;
     153        case IndicatorType_USB:           pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_USBDevices);       break;
     154        case IndicatorType_Network:       pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_Network);          break;
     155        case IndicatorType_SharedFolders: pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders);    break;
     156        case IndicatorType_Display:       pAction = gActionPool->action(UIActionIndexRT_M_ViewPopup);        break;
     157        case IndicatorType_VideoCapture:  pAction = gActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture);     break;
     158        case IndicatorType_Mouse:         pAction = gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse); break;
     159        case IndicatorType_Keyboard:      pAction = gActionPool->action(UIActionIndexRT_M_Machine_M_Keyboard);         break;
    160160        default: break;
    161161    }
    … …  
    286286#endif /* !Q_WS_MAC */
    287287        /* Update status-bar visibility: */
    288         statusBar()->setVisible(gActionPool->action(UIActionIndexRuntime_Toggle_StatusBar)->isChecked());
     288        statusBar()->setVisible(gActionPool->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());
    289289        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible());
    290290    }

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

    r52130 r52133  
    4848     * the linked key without the 'Host+' part we are adding it here. */
    4949    QString strHotKey = QString("Host+%1")
    50         .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRuntime_Toggle_Scale)->text()));
     50        .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRT_M_View_T_Scale)->text()));
    5151    Assert(!strHotKey.isEmpty());
    5252
    … …  
    7676
    7777    /* Take care of view-action toggle state: */
    78     UIAction *pActionScale = gActionPool->action(UIActionIndexRuntime_Toggle_Scale);
     78    UIAction *pActionScale = gActionPool->action(UIActionIndexRT_M_View_T_Scale);
    7979    if (!pActionScale->isChecked())
    8080    {
    … …  
    9292
    9393    /* "View" actions connections: */
    94     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     94    connect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    9595            this, SLOT(sltChangeVisualStateToNormal()));
    96     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     96    connect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    9797            this, SLOT(sltChangeVisualStateToFullscreen()));
    98     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     98    connect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    9999            this, SLOT(sltChangeVisualStateToSeamless()));
    100100}
    … …  
    171171{
    172172    /* "View" actions disconnections: */
    173     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     173    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    174174               this, SLOT(sltChangeVisualStateToNormal()));
    175     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     175    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    176176               this, SLOT(sltChangeVisualStateToFullscreen()));
    177     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     177    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    178178               this, SLOT(sltChangeVisualStateToSeamless()));
    179179
    … …  
    186186{
    187187    /* Take care of view-action toggle state: */
    188     UIAction *pActionScale = gActionPool->action(UIActionIndexRuntime_Toggle_Scale);
     188    UIAction *pActionScale = gActionPool->action(UIActionIndexRT_M_View_T_Scale);
    189189    if (pActionScale->isChecked())
    190190    {

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

    r52130 r52133  
    7575     * the linked key without the 'Host+' part we are adding it here. */
    7676    QString hotKey = QString("Host+%1")
    77         .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->text()));
     77        .arg(VBoxGlobal::extractKeyFromActionText(gActionPool->action(UIActionIndexRT_M_View_T_Seamless)->text()));
    7878    Assert(!hotKey.isEmpty());
    7979
    … …  
    204204
    205205    /* Disable mouse-integration isn't allowed in seamless: */
    206     gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration)->setVisible(false);
     206    gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration)->setVisible(false);
    207207
    208208    /* Take care of view-action toggle state: */
    209     UIAction *pActionSeamless = gActionPool->action(UIActionIndexRuntime_Toggle_Seamless);
     209    UIAction *pActionSeamless = gActionPool->action(UIActionIndexRT_M_View_T_Seamless);
    210210    if (!pActionSeamless->isChecked())
    211211    {
    … …  
    223223
    224224    /* "View" actions connections: */
    225     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     225    connect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    226226            this, SLOT(sltChangeVisualStateToNormal()));
    227     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     227    connect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    228228            this, SLOT(sltChangeVisualStateToFullscreen()));
    229     connect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     229    connect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    230230            this, SLOT(sltChangeVisualStateToScale()));
    231231}
    … …  
    304304{
    305305    /* "View" actions disconnections: */
    306     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SIGNAL(triggered(bool)),
     306    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SIGNAL(triggered(bool)),
    307307               this, SLOT(sltChangeVisualStateToNormal()));
    308     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Fullscreen), SIGNAL(triggered(bool)),
     308    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Fullscreen), SIGNAL(triggered(bool)),
    309309               this, SLOT(sltChangeVisualStateToFullscreen()));
    310     disconnect(gActionPool->action(UIActionIndexRuntime_Toggle_Scale), SIGNAL(triggered(bool)),
     310    disconnect(gActionPool->action(UIActionIndexRT_M_View_T_Scale), SIGNAL(triggered(bool)),
    311311               this, SLOT(sltChangeVisualStateToScale()));
    312312
    … …  
    318318{
    319319    /* Take care of view-action toggle state: */
    320     UIAction *pActionSeamless = gActionPool->action(UIActionIndexRuntime_Toggle_Seamless);
     320    UIAction *pActionSeamless = gActionPool->action(UIActionIndexRT_M_View_T_Seamless);
    321321    if (pActionSeamless->isChecked())
    322322    {
    … …  
    328328
    329329    /* Reenable mouse-integration action: */
    330     gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration)->setVisible(true);
     330    gActionPool->action(UIActionIndexRT_M_Machine_M_Mouse_T_Integration)->setVisible(true);
    331331
    332332    /* Call to base-class: */
    … …  
    340340
    341341    /* Get corresponding menu: */
    342     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
     342    QMenu *pMenu = gActionPool->action(UIActionIndexRT_M_View)->menu();
    343343    AssertPtrReturnVoid(pMenu);
    344344

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

    r52129 r52133  
    119119    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
    120120    connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
    121             gActionPool->action(UIActionIndexRuntime_Toggle_Seamless), SLOT(trigger()));
     121            gActionPool->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger()));
    122122    connect(m_pMiniToolBar, SIGNAL(sigCloseAction()),
    123             gActionPool->action(UIActionIndexRuntime_Simple_Close), SLOT(trigger()));
     123            gActionPool->action(UIActionIndexRT_M_Machine_S_Close), SLOT(trigger()));
    124124    connect(m_pMiniToolBar, SIGNAL(sigNotifyAboutFocusStolen()), this, SLOT(sltRevokeFocus()));
    125125}
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette