Changeset 106032 in vbox for trunk/src/VBox

Timestamp:

Sep 12, 2024 1:01:39 PM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: macOS/ARM: Make sure no unconditional BETA label is shown for ARM hosts anymore, the rules are the same now as for x86; Make sure Dev Preview label presence for ARM is independent on BETA label presence.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIVersion.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)

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

@@ -211 +211 @@
 bool UIVersionInfo::isBeta()
 {
-#if defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-    return true;
-#else
     return vboxVersionString().contains(QRegularExpression("BETA|ALPHA", QRegularExpression::CaseInsensitiveOption));
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -688 +688 @@
 
 #if defined(VBOX_WS_MAC) && (defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32))
-                        /* Branding stuff for macOS ARM platform: */
-                        if (UIVersionInfo::showBetaLabel())
+                        /* Check whether we should show Dev Preview tag: */
+                        bool fShowDevPreviewTag = false;
+                        const CVirtualBox comVBox = gpGlobalSession->virtualBox();
+                        if (comVBox.isNotNull())
                         {
-                            /* Check whether we should show Dev Preview tag: */
-                            bool fShowDevPreviewTag = false;
-                            const CVirtualBox comVBox = gpGlobalSession->virtualBox();
-                            if (comVBox.isNotNull())
-                            {
-                                const CSystemProperties comSystemProps = comVBox.GetSystemProperties();
-                                if (comVBox.isOk() && comSystemProps.isNotNull())
-                                    fShowDevPreviewTag =
-                                        comSystemProps.GetSupportedPlatformArchitectures().contains(KPlatformArchitecture_x86);
-                            }
-                            /* Enable Dev Preview tag: */
-                            if (fShowDevPreviewTag)
-                            {
-                                m_pToolBar->emulateMacToolbar();
-                                m_pToolBar->enableBranding(UIIconPool::iconSet(":/explosion_hazard_32px.png"),
-                                                           "Dev Preview", // do we need to make it NLS?
-                                                           QColor(246, 179, 0),
-                                                           74 /* width of BETA label */);
-                            }
+                            const CSystemProperties comSystemProps = comVBox.GetSystemProperties();
+                            if (comVBox.isOk() && comSystemProps.isNotNull())
+                                fShowDevPreviewTag =
+                                    comSystemProps.GetSupportedPlatformArchitectures().contains(KPlatformArchitecture_x86);
+                        }
+                        /* Enable Dev Preview tag: */
+                        if (fShowDevPreviewTag)
+                        {
+                            m_pToolBar->emulateMacToolbar();
+                            m_pToolBar->enableBranding(UIIconPool::iconSet(":/explosion_hazard_32px.png"),
+                                                       "Dev Preview", // do we need to make it NLS?
+                                                       QColor(246, 179, 0),
+                                                       74 /* width of BETA label */);
                         }
 #endif /* VBOX_WS_MAC && (RT_ARCH_ARM64 || RT_ARCH_ARM32) */