Changeset 52180 in vbox

Timestamp:

Jul 25, 2014 12:18:10 AM (11 years ago)

Author:

vboxsync

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

95231

Message:

FE/Qt: Runtime UI: Missed menu restriction bits.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (10 diffs)
• extradata/UIExtraDataDefs.h (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (5 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -407 +407 @@
     switch (runtimeMenuApplicationActionType)
     {
-        case RuntimeMenuApplicationActionType_About: strResult = "About"; break;
-        case RuntimeMenuApplicationActionType_All:   strResult = "All"; break;
+        case RuntimeMenuApplicationActionType_About:       strResult = "About"; break;
+        case RuntimeMenuApplicationActionType_Preferences: strResult = "Preferences"; break;
+        case RuntimeMenuApplicationActionType_Close:       strResult = "Close"; break;
+        case RuntimeMenuApplicationActionType_All:         strResult = "All"; break;
         default:
         {
@@ -423 +425 @@
     /* Here we have some fancy stuff allowing us
      * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys; QList<RuntimeMenuApplicationActionType> values;
-    keys << "About";  values << RuntimeMenuApplicationActionType_About;
-    keys << "All";    values << RuntimeMenuApplicationActionType_All;
+    QStringList keys;      QList<RuntimeMenuApplicationActionType> values;
+    keys << "About";       values << RuntimeMenuApplicationActionType_About;
+    keys << "Preferences"; values << RuntimeMenuApplicationActionType_Preferences;
+    keys << "Close";       values << RuntimeMenuApplicationActionType_Close;
+    keys << "All";         values << RuntimeMenuApplicationActionType_All;
     /* Invalid type for unknown words: */
     if (!keys.contains(strRuntimeMenuApplicationActionType, Qt::CaseInsensitive))
@@ -514 +518 @@
         case RuntimeMenuViewActionType_StatusBarSettings: strResult = "StatusBarSettings"; break;
         case RuntimeMenuViewActionType_ToggleStatusBar:   strResult = "ToggleStatusBar"; break;
+        case RuntimeMenuViewActionType_Resize:            strResult = "Resize"; break;
         case RuntimeMenuViewActionType_Multiscreen:       strResult = "Multiscreen"; break;
         case RuntimeMenuViewActionType_All:               strResult = "All"; break;
@@ -539 +544 @@
     keys << "StatusBarSettings"; values << RuntimeMenuViewActionType_StatusBarSettings;
     keys << "ToggleStatusBar";   values << RuntimeMenuViewActionType_ToggleStatusBar;
+    keys << "Resize";            values << RuntimeMenuViewActionType_Resize;
     keys << "Multiscreen";       values << RuntimeMenuViewActionType_Multiscreen;
     keys << "All";               values << RuntimeMenuViewActionType_All;
@@ -554 +560 @@
     switch (runtimeMenuDevicesActionType)
     {
+        case RuntimeMenuDevicesActionType_HardDrives:            strResult = "HardDrives"; break;
+        case RuntimeMenuDevicesActionType_HardDrivesSettings:    strResult = "HardDrivesSettings"; break;
         case RuntimeMenuDevicesActionType_OpticalDevices:        strResult = "OpticalDevices"; break;
         case RuntimeMenuDevicesActionType_FloppyDevices:         strResult = "FloppyDevices"; break;
@@ -562 +570 @@
         case RuntimeMenuDevicesActionType_Network:               strResult = "Network"; break;
         case RuntimeMenuDevicesActionType_NetworkSettings:       strResult = "NetworkSettings"; break;
+        case RuntimeMenuDevicesActionType_SharedFolders:         strResult = "SharedFolders"; break;
         case RuntimeMenuDevicesActionType_SharedFoldersSettings: strResult = "SharedFoldersSettings"; break;
         case RuntimeMenuDevicesActionType_VRDEServer:            strResult = "VRDEServer"; break;
         case RuntimeMenuDevicesActionType_VideoCapture:          strResult = "VideoCapture"; break;
+        case RuntimeMenuDevicesActionType_VideoCaptureSettings:  strResult = "VideoCaptureSettings"; break;
         case RuntimeMenuDevicesActionType_InstallGuestTools:     strResult = "InstallGuestTools"; break;
         case RuntimeMenuDevicesActionType_All:                   strResult = "All"; break;
@@ -582 +592 @@
      * to search through the keys using 'case-insensitive' rule: */
     QStringList keys;                QList<RuntimeMenuDevicesActionType> values;
+    keys << "HardDrives";            values << RuntimeMenuDevicesActionType_HardDrives;
+    keys << "HardDrivesSettings";    values << RuntimeMenuDevicesActionType_HardDrivesSettings;
     keys << "OpticalDevices";        values << RuntimeMenuDevicesActionType_OpticalDevices;
     keys << "FloppyDevices";         values << RuntimeMenuDevicesActionType_FloppyDevices;
@@ -590 +602 @@
     keys << "Network";               values << RuntimeMenuDevicesActionType_Network;
     keys << "NetworkSettings";       values << RuntimeMenuDevicesActionType_NetworkSettings;
+    keys << "SharedFolders";         values << RuntimeMenuDevicesActionType_SharedFolders;
     keys << "SharedFoldersSettings"; values << RuntimeMenuDevicesActionType_SharedFoldersSettings;
     keys << "VRDEServer";            values << RuntimeMenuDevicesActionType_VRDEServer;
     keys << "VideoCapture";          values << RuntimeMenuDevicesActionType_VideoCapture;
+    keys << "VideoCaptureSettings";  values << RuntimeMenuDevicesActionType_VideoCaptureSettings;
     keys << "InstallGuestTools";     values << RuntimeMenuDevicesActionType_InstallGuestTools;
     keys << "All";                   values << RuntimeMenuDevicesActionType_All;
@@ -656 +670 @@
 #ifndef Q_WS_MAC
         case RuntimeMenuHelpActionType_About:                strResult = "About"; break;
+        case RuntimeMenuHelpActionType_Preferences:          strResult = "Preferences"; break;
 #endif /* !Q_WS_MAC */
         case RuntimeMenuHelpActionType_All:                  strResult = "All"; break;
@@ -681 +696 @@
 #ifndef Q_WS_MAC
     keys << "About";                values << RuntimeMenuHelpActionType_About;
+    keys << "Preferences";          values << RuntimeMenuHelpActionType_Preferences;
 #endif /* !Q_WS_MAC */
     keys << "All";                  values << RuntimeMenuHelpActionType_All;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -379 +379 @@
     RuntimeMenuApplicationActionType_About       = RT_BIT(0),
     RuntimeMenuApplicationActionType_Preferences = RT_BIT(1),
+    RuntimeMenuApplicationActionType_Close       = RT_BIT(2),
     RuntimeMenuApplicationActionType_All         = 0xFFFF
 };
@@ -420 +421 @@
     RuntimeMenuViewActionType_StatusBarSettings = RT_BIT(6),
     RuntimeMenuViewActionType_ToggleStatusBar   = RT_BIT(7),
-    RuntimeMenuViewActionType_Multiscreen       = RT_BIT(8),
+    RuntimeMenuViewActionType_Resize            = RT_BIT(8),
+    RuntimeMenuViewActionType_Multiscreen       = RT_BIT(9),
     RuntimeMenuViewActionType_All               = 0xFFFF
 };
@@ -428 +430 @@
 {
     RuntimeMenuDevicesActionType_Invalid               = 0,
-    RuntimeMenuDevicesActionType_OpticalDevices        = RT_BIT(0),
-    RuntimeMenuDevicesActionType_FloppyDevices         = RT_BIT(1),
-    RuntimeMenuDevicesActionType_USBDevices            = RT_BIT(2),
-    RuntimeMenuDevicesActionType_WebCams               = RT_BIT(3),
-    RuntimeMenuDevicesActionType_SharedClipboard       = RT_BIT(4),
-    RuntimeMenuDevicesActionType_DragAndDrop           = RT_BIT(5),
-    RuntimeMenuDevicesActionType_Network               = RT_BIT(6),
-    RuntimeMenuDevicesActionType_NetworkSettings       = RT_BIT(7),
-    RuntimeMenuDevicesActionType_SharedFoldersSettings = RT_BIT(8),
-    RuntimeMenuDevicesActionType_VRDEServer            = RT_BIT(9),
-    RuntimeMenuDevicesActionType_VideoCapture          = RT_BIT(10),
-    RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(11),
+    RuntimeMenuDevicesActionType_HardDrives            = RT_BIT(0),
+    RuntimeMenuDevicesActionType_HardDrivesSettings    = RT_BIT(1),
+    RuntimeMenuDevicesActionType_OpticalDevices        = RT_BIT(2),
+    RuntimeMenuDevicesActionType_FloppyDevices         = RT_BIT(3),
+    RuntimeMenuDevicesActionType_USBDevices            = RT_BIT(4),
+    RuntimeMenuDevicesActionType_WebCams               = RT_BIT(5),
+    RuntimeMenuDevicesActionType_SharedClipboard       = RT_BIT(6),
+    RuntimeMenuDevicesActionType_DragAndDrop           = RT_BIT(7),
+    RuntimeMenuDevicesActionType_Network               = RT_BIT(8),
+    RuntimeMenuDevicesActionType_NetworkSettings       = RT_BIT(9),
+    RuntimeMenuDevicesActionType_SharedFolders         = RT_BIT(10),
+    RuntimeMenuDevicesActionType_SharedFoldersSettings = RT_BIT(11),
+    RuntimeMenuDevicesActionType_VRDEServer            = RT_BIT(12),
+    RuntimeMenuDevicesActionType_VideoCapture          = RT_BIT(13),
+    RuntimeMenuDevicesActionType_VideoCaptureSettings  = RT_BIT(14),
+    RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(15),
     RuntimeMenuDevicesActionType_All                   = 0xFFFF
 };

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

@@ -1396 +1396 @@
     bool fSeparator1 = false;
 
+    /* 'Hard Drives' submenu: */
+    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_HardDrives)
+    {
+//        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives));
+//        fSeparator1 = true;
+    }
+    else
+        gpActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives)->setEnabled(false);
+    updateMenuDevicesHardDrives();
+
     /* 'Optical Devices' submenu: */
     if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_OpticalDevices)
@@ -1460 +1470 @@
     updateMenuDevicesNetwork();
 
-    /* 'Shared Folders Settings' action: */
-    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedFoldersSettings)
-    {
-        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
-        fSeparator1 = true;
-    }
-    else
-        gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings)->setEnabled(false);
+    /* 'Shared Folders' submenu: */
+    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedFolders)
+    {
+//        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders));
+//        fSeparator1 = true;
+    }
+    else
+        gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders)->setEnabled(false);
+    updateMenuDevicesSharedFolders();
 
     /* Separator #1: */
@@ -1496 +1507 @@
     else
         gpActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_T_Start)->setEnabled(false);
+    updateMenuDevicesVideoCapture();
 
     /* Separator #2: */
@@ -1507 +1519 @@
     else
         gpActionPool->action(UIActionIndexRT_M_Devices_S_InstallGuestTools)->setEnabled(false);
+}
+
+void UIMachineLogic::updateMenuDevicesHardDrives()
+{
+    /* Get corresponding menu: */
+    QMenu *pMenu = gpActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+
+    /* 'Hard Drives Settings' submenu: */
+    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_HardDrivesSettings)
+        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings));
+    else
+        gpActionPool->action(UIActionIndexRT_M_Devices_M_HardDrives_S_Settings)->setEnabled(false);
 }
 
@@ -1523 +1551 @@
     else
         gpActionPool->action(UIActionIndexRT_M_Devices_M_Network_S_Settings)->setEnabled(false);
+}
+
+void UIMachineLogic::updateMenuDevicesSharedFolders()
+{
+    /* Get corresponding menu: */
+    QMenu *pMenu = gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+
+    /* 'Shared Folders Settings' action: */
+    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_SharedFoldersSettings)
+        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings));
+    else
+        gpActionPool->action(UIActionIndexRT_M_Devices_M_SharedFolders_S_Settings)->setEnabled(false);
+}
+
+void UIMachineLogic::updateMenuDevicesVideoCapture()
+{
+    /* Get corresponding menu: */
+    QMenu *pMenu = gpActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture)->menu();
+    AssertPtrReturnVoid(pMenu);
+    /* Clear contents: */
+    pMenu->clear();
+
+
+    /* 'Video Capture Settings' action: */
+    if (uisession()->allowedActionsMenuDevices() & RuntimeMenuDevicesActionType_VideoCaptureSettings)
+        pMenu->addAction(gpActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings));
+    else
+        gpActionPool->action(UIActionIndexRT_M_Devices_M_VideoCapture_S_Settings)->setEnabled(false);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -203 +203 @@
     /** Updates the 'Devices' menu. */
     virtual void updateMenuDevices();
+    /** Updates the 'Devices' : 'Hard Drives' menu. */
+    virtual void updateMenuDevicesHardDrives();
     /** Updates the 'Devices' : 'Network' menu. */
     virtual void updateMenuDevicesNetwork();
+    /** Updates the 'Devices' : 'Shared Folders' menu. */
+    virtual void updateMenuDevicesSharedFolders();
+    /** Updates the 'Devices' : 'Video Capture' menu. */
+    virtual void updateMenuDevicesVideoCapture();
 #ifdef VBOX_WITH_DEBUGGER_GUI
     virtual void updateMenuDebug();

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

@@ -143 +143 @@
 
     /* For each the machine-window: */
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
-    {
-        /* Add 'Virtual Screen %1' menu: */
-        const int iScreenID = pMachineWindow->screenId();
-        QMenu *pSubMenu = pMenu->addMenu(QApplication::translate("UIMultiScreenLayout",
-                                                                 "Virtual Screen %1").arg(iScreenID + 1));
-        pSubMenu->setProperty("Screen ID", iScreenID);
-        pSubMenu->setEnabled(fGAEnabled);
-        connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewVirtualScreen()));
-    }
+    if (uisession()->allowedActionsMenuView() & RuntimeMenuViewActionType_Resize)
+        foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        {
+            /* Add 'Virtual Screen %1' menu: */
+            const int iScreenID = pMachineWindow->screenId();
+            QMenu *pSubMenu = pMenu->addMenu(QApplication::translate("UIMultiScreenLayout",
+                                                                     "Virtual Screen %1").arg(iScreenID + 1));
+            pSubMenu->setProperty("Screen ID", iScreenID);
+            pSubMenu->setEnabled(fGAEnabled);
+            connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewVirtualScreen()));
+        }
 }