Changeset 85772 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 14, 2020 2:06:17 PM (5 years ago)

Author:

vboxsync

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

139924

Message:

FE/Qt: bugref:6659: macOS: Extending GUI/Customizations extra-data flag with noUserElements option available on macOS only (alternative to noMenuBar on other platforms) which hides both menu-bar and dock.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• platform/darwin/UICocoaApplication.h (modified) (1 diff)
• platform/darwin/UICocoaApplication.mm (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)

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

@@ -1834 +1834 @@
     switch (guiFeatureType)
     {
-        case GUIFeatureType_NoSelector:  strResult = "noSelector"; break;
-        case GUIFeatureType_NoMenuBar:   strResult = "noMenuBar"; break;
-        case GUIFeatureType_NoStatusBar: strResult = "noStatusBar"; break;
+        case GUIFeatureType_NoSelector:     strResult = "noSelector"; break;
+#ifdef VBOX_WS_MAC
+        case GUIFeatureType_NoUserElements: strResult = "noUserElements"; break;
+#else
+        case GUIFeatureType_NoMenuBar:      strResult = "noMenuBar"; break;
+#endif
+        case GUIFeatureType_NoStatusBar:    strResult = "noStatusBar"; break;
         default:
         {
@@ -1851 +1855 @@
     /* Here we have some fancy stuff allowing us
      * to search through the keys using 'case-insensitive' rule: */
-    QStringList keys;      QList<GUIFeatureType> values;
-    keys << "noSelector";  values << GUIFeatureType_NoSelector;
-    keys << "noMenuBar";   values << GUIFeatureType_NoMenuBar;
-    keys << "noStatusBar"; values << GUIFeatureType_NoStatusBar;
+    QStringList keys;         QList<GUIFeatureType> values;
+    keys << "noSelector";     values << GUIFeatureType_NoSelector;
+#ifdef VBOX_WS_MAC
+    keys << "noUserElements"; values << GUIFeatureType_NoUserElements;
+#else
+    keys << "noMenuBar";      values << GUIFeatureType_NoMenuBar;
+#endif
+    keys << "noStatusBar";    values << GUIFeatureType_NoStatusBar;
     /* None type for unknown words: */
     if (!keys.contains(strGuiFeatureType, Qt::CaseInsensitive))

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

@@ -811 +811 @@
 enum GUIFeatureType
 {
-    GUIFeatureType_None        = 0,
-    GUIFeatureType_NoSelector  = RT_BIT(0),
-    GUIFeatureType_NoMenuBar   = RT_BIT(1),
-    GUIFeatureType_NoStatusBar = RT_BIT(2),
-    GUIFeatureType_All         = 0xFF
+    GUIFeatureType_None           = 0,
+    GUIFeatureType_NoSelector     = RT_BIT(0),
+#ifdef VBOX_WS_MAC
+    GUIFeatureType_NoUserElements = RT_BIT(1),
+#else
+    GUIFeatureType_NoMenuBar      = RT_BIT(1),
+#endif
+    GUIFeatureType_NoStatusBar    = RT_BIT(2),
+    GUIFeatureType_All            = 0xFF
 };
 

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

@@ -1910 +1910 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
            << GUI_Progress_LegacyMode
+           << GUI_Customizations
            << GUI_RestrictedGlobalSettingsPages << GUI_RestrictedMachineSettingsPages
            << GUI_LanguageID

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.h

@@ -70 +70 @@
     void hide();
 
+    /** Hides user elements such as menu-bar and dock. */
+    void hideUserElements();
+
     /** Register native @a pfnCallback of the @a pvUser taking event @a fMask into account. */
     void registerForNativeEvents(uint32_t fMask, PFNVBOXCACALLBACK pfnCallback, void *pvUser);

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaApplication.mm

@@ -324 +324 @@
 }
 
+void UICocoaApplication::hideUserElements()
+{
+    [m_pNative setPresentationOptions:NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock];
+}
+
 void UICocoaApplication::registerForNativeEvents(uint32_t fMask, PFNVBOXCACALLBACK pfnCallback, void *pvUser)
 {

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

@@ -51 +51 @@
 #include "UISettingsDialogSpecific.h"
 #ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
 # include "VBoxUtils-darwin.h"
 #endif
@@ -1311 +1312 @@
         pGuestAutoresizeSwitch->setChecked(gEDataManager->guestScreenAutoResizeEnabled(uMachineID));
 
-#ifndef VBOX_WS_MAC
+#ifdef VBOX_WS_MAC
+        /* User-element (Menu-bar and Dock) options: */
+        {
+            const bool fDisabled = gEDataManager->guiFeatureEnabled(GUIFeatureType_NoUserElements);
+            if (fDisabled)
+                UICocoaApplication::instance()->hideUserElements();
+        }
+#else /* !VBOX_WS_MAC */
         /* Menu-bar options: */
         {