Changeset 67942 in vbox

Timestamp:

Jul 12, 2017 3:19:36 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8924: Possibility to disable VM menu-bar/status-bar context-menu by disabling corresponding extra-data flags (GUI/MenuBar/ContextMenu/Enabled, GUI/StatusBar/ContextMenu/Enabled).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

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

@@ -105 +105 @@
 const char* UIExtraDataDefs::GUI_MenuBar_Enabled = "GUI/MenuBar/Enabled";
 #endif /* !VBOX_WS_MAC */
+const char* UIExtraDataDefs::GUI_MenuBar_ContextMenu_Enabled = "GUI/MenuBar/ContextMenu/Enabled";
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
 const char* UIExtraDataDefs::GUI_RestrictedRuntimeApplicationMenuActions = "GUI/RestrictedRuntimeApplicationMenuActions";
@@ -145 +146 @@
 #endif /* !VBOX_WS_MAC */
 const char* UIExtraDataDefs::GUI_StatusBar_Enabled = "GUI/StatusBar/Enabled";
+const char* UIExtraDataDefs::GUI_StatusBar_ContextMenu_Enabled = "GUI/StatusBar/ContextMenu/Enabled";
 const char* UIExtraDataDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
 const char* UIExtraDataDefs::GUI_StatusBar_IndicatorOrder = "GUI/StatusBar/IndicatorOrder";

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

@@ -183 +183 @@
         extern const char* GUI_MenuBar_Enabled;
 #endif /* !VBOX_WS_MAC */
+        /** Holds Runtime UI menu-bar context-menu availability status. */
+        extern const char* GUI_MenuBar_ContextMenu_Enabled;
         /** Holds restricted Runtime UI menu types. */
         extern const char* GUI_RestrictedRuntimeMenus;
@@ -256 +258 @@
         /** Holds Runtime UI status-bar availability status. */
         extern const char* GUI_StatusBar_Enabled;
+        /** Holds Runtime UI status-bar context-menu availability status. */
+        extern const char* GUI_StatusBar_ContextMenu_Enabled;
         /** Holds restricted Runtime UI status-bar indicators. */
         extern const char* GUI_RestrictedStatusBarIndicators;

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

@@ -1959 +1959 @@
 #endif /* !VBOX_WS_MAC */
            << GUI_LastNormalWindowPosition << GUI_LastScaleWindowPosition
+#ifndef VBOX_WS_MAC
+           << GUI_MenuBar_Enabled
+#endif
+           << GUI_MenuBar_ContextMenu_Enabled
            << GUI_RestrictedRuntimeMenus
            << GUI_RestrictedRuntimeApplicationMenuActions
@@ -1989 +1993 @@
            << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
 #endif /* !VBOX_WS_MAC */
-           << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
+           << GUI_StatusBar_Enabled << GUI_StatusBar_ContextMenu_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
 #ifdef VBOX_WS_MAC
            << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconDisableOverlay
@@ -2929 +2933 @@
 #endif /* !VBOX_WS_MAC */
 
+bool UIExtraDataManager::menuBarContextMenuEnabled(const QString &strID)
+{
+    /* 'True' unless feature restricted: */
+    return !isFeatureRestricted(GUI_MenuBar_ContextMenu_Enabled, strID);
+}
+
+void UIExtraDataManager::setMenuBarContextMenuEnabled(bool fEnabled, const QString &strID)
+{
+    /* 'False' if feature restricted, null-string otherwise: */
+    setExtraDataString(GUI_MenuBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), strID);
+}
+
 UIExtraDataMetaDefs::MenuType UIExtraDataManager::restrictedRuntimeMenuTypes(const QString &strID)
 {
@@ -3635 +3651 @@
     /* 'False' if feature restricted, null-string otherwise: */
     setExtraDataString(GUI_StatusBar_Enabled, toFeatureRestricted(!fEnabled), strID);
+}
+
+bool UIExtraDataManager::statusBarContextMenuEnabled(const QString &strID)
+{
+    /* 'True' unless feature restricted: */
+    return !isFeatureRestricted(GUI_StatusBar_ContextMenu_Enabled, strID);
+}
+
+void UIExtraDataManager::setStatusBarContextMenuEnabled(bool fEnabled, const QString &strID)
+{
+    /* 'False' if feature restricted, null-string otherwise: */
+    setExtraDataString(GUI_StatusBar_ContextMenu_Enabled, toFeatureRestricted(!fEnabled), strID);
 }
 

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

@@ -371 +371 @@
 #endif /* !VBOX_WS_MAC */
 
+        /** Returns whether Runtime UI menu-bar context-menu is enabled. */
+        bool menuBarContextMenuEnabled(const QString &strID);
+        /** Defines whether Runtime UI menu-bar context-menu is @a fEnabled. */
+        void setMenuBarContextMenuEnabled(bool fEnabled, const QString &strID);
+
         /** Returns restricted Runtime UI menu types. */
         UIExtraDataMetaDefs::MenuType restrictedRuntimeMenuTypes(const QString &strID);
@@ -498 +503 @@
         /** Defines whether Runtime UI status-bar is @a fEnabled. */
         void setStatusBarEnabled(bool fEnabled, const QString &strID);
+
+        /** Returns whether Runtime UI status-bar context-menu is enabled. */
+        bool statusBarContextMenuEnabled(const QString &strID);
+        /** Defines whether Runtime UI status-bar context-menu is @a fEnabled. */
+        void setStatusBarContextMenuEnabled(bool fEnabled, const QString &strID);
 
         /** Returns restricted Runtime UI status-bar indicator list. */

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

@@ -161 +161 @@
 {
     /* Raise action's context-menu: */
-    actionPool()->action(UIActionIndexRT_M_View_M_MenuBar)->menu()->exec(menuBar()->mapToGlobal(position));
+    if (gEDataManager->menuBarContextMenuEnabled(vboxGlobal().managedVMUuid()))
+        actionPool()->action(UIActionIndexRT_M_View_M_MenuBar)->menu()->exec(menuBar()->mapToGlobal(position));
 }
 #endif /* !RT_OS_DARWIN */
@@ -194 +195 @@
 {
     /* Raise action's context-menu: */
-    actionPool()->action(UIActionIndexRT_M_View_M_StatusBar)->menu()->exec(statusBar()->mapToGlobal(position));
+    if (gEDataManager->statusBarContextMenuEnabled(vboxGlobal().managedVMUuid()))
+        actionPool()->action(UIActionIndexRT_M_View_M_StatusBar)->menu()->exec(statusBar()->mapToGlobal(position));
 }