Changeset 102503 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 6, 2023 1:35:58 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: macOS: Bring back macOS version detection code; Based on partically reverted r156218 (only detection code, no workarounds); This is useful to adjust Qt palette to be more native, for example.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICommon.cpp (modified) (3 diffs)
• UICommon.h (modified) (2 diffs)
• UIDefs.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -192 +192 @@
 #endif
 #ifdef VBOX_WS_MAC
+    , m_enmMacOSVersion(MacOSXRelease_Old)
     , m_fDarkMode(false)
 #endif
@@ -248 +249 @@
             this, &UICommon::sltHandleCommitDataRequest);
 #endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+
+#ifdef VBOX_WS_MAC
+    /* Determine OS release early: */
+    m_enmMacOSVersion = determineOsRelease();
+#endif
 
 #ifdef VBOX_WS_NIX
@@ -954 +960 @@
     return settings.value(QString("%1").arg(strKey)).toString();
 }
+
+#ifdef VBOX_WS_MAC
+/* static */
+MacOSXRelease UICommon::determineOsRelease()
+{
+    /* Prepare 'utsname' struct: */
+    utsname info;
+    if (uname(&info) != -1)
+    {
+        /* Cut the major release index of the string we have, s.a. 'man uname': */
+        const int iRelease = QString(info.release).section('.', 0, 0).toInt();
+        /* Check boundaries: */
+        if (iRelease <= MacOSXRelease_FirstUnknown)
+            return MacOSXRelease_Old;
+        else if (iRelease >= MacOSXRelease_LastUnknown)
+            return MacOSXRelease_New;
+        else
+            return (MacOSXRelease)iRelease;
+    }
+    /* Return 'Old' by default: */
+    return MacOSXRelease_Old;
+}
+#endif /* VBOX_WS_MAC */
 
 #ifdef VBOX_WS_NIX

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -214 +214 @@
      * @{ */
 #ifdef VBOX_WS_MAC
+        /** macOS: Returns #MacOSXRelease determined by <i>uname</i> call. */
+        static MacOSXRelease determineOsRelease();
+        /** macOS: Returns #MacOSXRelease determined during UICommon prepare routine. */
+        MacOSXRelease osRelease() const { return m_enmMacOSVersion; }
+
         /** macOS: Returns whether macOS is in Dark mode. */
         bool isInDarkMode() const { return m_fDarkMode; }
@@ -654 +659 @@
      * @{ */
 #ifdef VBOX_WS_MAC
+        /** macOS: Holds the #MacOSXRelease determined using <i>uname</i> call. */
+        MacOSXRelease  m_enmMacOSVersion;
+
         /** macOS: Holds whether macOS is in Dark mode. */
         bool  m_fDarkMode;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -101 +101 @@
 
 
+#ifdef VBOX_WS_MAC
+/** Known macOS releases. */
+enum MacOSXRelease
+{
+    MacOSXRelease_Old,
+    MacOSXRelease_FirstUnknown = 9,
+    MacOSXRelease_SnowLeopard  = 10,
+    MacOSXRelease_Lion         = 11,
+    MacOSXRelease_MountainLion = 12,
+    MacOSXRelease_Mavericks    = 13,
+    MacOSXRelease_Yosemite     = 14,
+    MacOSXRelease_ElCapitan    = 15,
+    MacOSXRelease_Sierra       = 16,
+    MacOSXRelease_HighSierra   = 17,
+    MacOSXRelease_Mojave       = 18,
+    MacOSXRelease_Catalina     = 19,
+    MacOSXRelease_BigSur       = 20,
+    MacOSXRelease_Monterey     = 21,
+    MacOSXRelease_Ventura      = 22,
+    MacOSXRelease_Sonoma       = 23,
+    MacOSXRelease_LastUnknown  = 24,
+    MacOSXRelease_New,
+};
+#endif /* VBOX_WS_MAC */
+
+
 /** Size suffixes. */
 enum SizeSuffix