Changeset 52467 in vbox

Timestamp:

Aug 22, 2014 11:55:21 AM (11 years ago)

Author:

vboxsync

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

95682

Message:

FE/Qt: 7462: Extra-data Manager should provide defaults for menu-bar restrictions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• runtime/UIActionPoolRuntime.cpp (modified) (14 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2594 +2594 @@
             result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | value);
     }
+    /* Defaults: */
+    if (result == UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid)
+    {
+        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_KeyboardSettings);
+        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState);
+        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuMachineActionType>(result | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_PowerOff);
+    }
     /* Return result: */
     return result;
@@ -2685 +2692 @@
         if (value != UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Invalid)
             result = static_cast<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(result | value);
+    }
+    /* Defaults: */
+    if (result == UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Invalid)
+    {
+        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(result | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_HardDrives);
+        result = static_cast<UIExtraDataMetaDefs::RuntimeMenuDevicesActionType>(result | UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_SharedFolders);
     }
     /* Return result: */

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

@@ -173 +173 @@
 protected:
 
-    void retranslateUi() {}
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Keyboard"));
+    }
 };
 
@@ -199 +202 @@
 };
 
-class UIActionMenuMouseIntegration : public UIActionMenu
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionMenuMouseIntegration(UIActionPool *pParent)
+class UIActionMenuMouse : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionMenuMouse(UIActionPool *pParent)
         : UIActionMenu(pParent) {}
 
 protected:
 
-    void retranslateUi() {}
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Mouse"));
+    }
 };
 
@@ -728 +734 @@
 };
 
-class UIActionMenuHardDisks : public UIActionMenu
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionMenuHardDisks(UIActionPool *pParent)
+class UIActionMenuHardDrives : public UIActionMenu
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionMenuHardDrives(UIActionPool *pParent)
         : UIActionMenu(pParent, ":/hd_16px.png", ":/hd_disabled_16px.png")
     {
@@ -742 +748 @@
 protected:
 
-    void retranslateUi() {}
-};
-
-class UIActionSimpleShowStorageSettingsDialog : public UIActionSimple
-{
-    Q_OBJECT;
-
-public:
-
-    UIActionSimpleShowStorageSettingsDialog(UIActionPool *pParent)
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Hard Drives"));
+    }
+};
+
+class UIActionSimpleShowHardDrivesSettingsDialog : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimpleShowHardDrivesSettingsDialog(UIActionPool *pParent)
         : UIActionSimple(pParent, ":/hd_settings_16px.png", ":/hd_settings_disabled_16px.png") {}
 
@@ -758 +767 @@
     QString shortcutExtraDataID() const
     {
-        return QString("StorageSettingsDialog");
-    }
-
-    void retranslateUi()
-    {
-        setName(QApplication::translate("UIActionPool", "&Storage Settings..."));
-        setStatusTip(QApplication::translate("UIActionPool", "Change the settings of storage devices"));
+        return QString("HardDriveSettingsDialog");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Hard Drive Settings..."));
+        setStatusTip(QApplication::translate("UIActionPool", "Change the settings of hard drives"));
     }
 };
@@ -952 +961 @@
 
     UIActionMenuSharedFolders(UIActionPool *pParent)
-        : UIActionMenu(pParent) {}
-
-protected:
-
-    void retranslateUi() {}
+        : UIActionMenu(pParent, ":/sf_16px.png", ":/sf_disabled_16px.png") {}
+
+protected:
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Shared Folders"));
+    }
 };
 
@@ -1018 +1030 @@
 protected:
 
-    void retranslateUi() {}
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Video Capture"));
+    }
 };
 
@@ -1442 +1457 @@
     m_pool[UIActionIndexRT_M_Machine_M_Keyboard] = new UIActionMenuKeyboard(this);
     m_pool[UIActionIndexRT_M_Machine_M_Keyboard_S_Settings] = new UIActionSimpleKeyboardSettings(this);
-    m_pool[UIActionIndexRT_M_Machine_M_Mouse] = new UIActionMenuMouseIntegration(this);
+    m_pool[UIActionIndexRT_M_Machine_M_Mouse] = new UIActionMenuMouse(this);
     m_pool[UIActionIndexRT_M_Machine_M_Mouse_T_Integration] = new UIActionToggleMouseIntegration(this);
     m_pool[UIActionIndexRT_M_Machine_S_TypeCAD] = new UIActionSimplePerformTypeCAD(this);
@@ -1469 +1484 @@
     /* 'Devices' actions: */
     m_pool[UIActionIndexRT_M_Devices] = new UIActionMenuDevices(this);
-    m_pool[UIActionIndexRT_M_Devices_M_HardDrives] = new UIActionMenuHardDisks(this);
-    m_pool[UIActionIndexRT_M_Devices_M_HardDrives_S_Settings] = new UIActionSimpleShowStorageSettingsDialog(this);
+    m_pool[UIActionIndexRT_M_Devices_M_HardDrives] = new UIActionMenuHardDrives(this);
+    m_pool[UIActionIndexRT_M_Devices_M_HardDrives_S_Settings] = new UIActionSimpleShowHardDrivesSettingsDialog(this);
     m_pool[UIActionIndexRT_M_Devices_M_OpticalDevices] = new UIActionMenuOpticalDevices(this);
     m_pool[UIActionIndexRT_M_Devices_M_FloppyDevices] = new UIActionMenuFloppyDevices(this);
@@ -1746 +1761 @@
     updateMenuMachineKeyboard();
 
+    /* 'Keyboard Settings' action: */
+    const bool fAllowToShowActionKeyboardSettings = isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_KeyboardSettings);
+    action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings)->setEnabled(fAllowToShowActionKeyboardSettings);
+    if (fAllowToShowActionKeyboardSettings)
+    {
+        pMenu->addAction(action(UIActionIndexRT_M_Machine_M_Keyboard_S_Settings));
+        fSeparator2 = true;
+    }
+
     /* 'Mouse' submenu: */
     const bool fAllowToShowActionMouse = isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Mouse);
@@ -1824 +1848 @@
     if (fAllowToShowActionSaveState)
     {
-//        pMenu->addAction(action(UIActionIndexRT_M_Machine_S_Save));
-//        fSeparator4 = true;
+        pMenu->addAction(action(UIActionIndexRT_M_Machine_S_Save));
+        fSeparator4 = true;
     }
 
@@ -1842 +1866 @@
     if (fAllowToShowActionPowerOff)
     {
-//        pMenu->addAction(action(UIActionIndexRT_M_Machine_S_PowerOff));
-//        fSeparator4 = true;
+        pMenu->addAction(action(UIActionIndexRT_M_Machine_S_PowerOff));
+        fSeparator4 = true;
     }
 
@@ -2231 +2255 @@
     if (fAllowToShowActionHardDrives)
     {
-//        pMenu->addAction(action(UIActionIndexRT_M_Devices_M_HardDrives));
-//        fSeparator1 = true;
+        pMenu->addAction(action(UIActionIndexRT_M_Devices_M_HardDrives));
+        fSeparator1 = true;
     }
     updateMenuDevicesHardDrives();
@@ -2306 +2330 @@
     if (fAllowToShowActionSharedFolders)
     {
-//        pMenu->addAction(action(UIActionIndexRT_M_Devices_M_SharedFolders));
-//        fSeparator1 = true;
+        pMenu->addAction(action(UIActionIndexRT_M_Devices_M_SharedFolders));
+        fSeparator1 = true;
     }
     updateMenuDevicesSharedFolders();