Changeset 102102 in vbox

Timestamp:

Nov 15, 2023 1:35:02 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10535. Using API properties rather than string comparison to determine verlay string.

Location:

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

Files:

• UIGuestOSType.cpp (modified) (3 diffs)
• UIGuestOSType.h (modified) (2 diffs)
• UIIconPool.cpp (modified) (2 diffs)
• UIIconPool.h (modified) (1 diff)

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

@@ -27 +27 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIGuestOSType.h"
 
@@ -195 +196 @@
 }
 
+bool UIGuestOSTypeManager::is64Bit(const QString &strTypeId) const
+{
+    return m_guestOSTypes.value(m_typeIdIndexMap.value(strTypeId, -1)).is64Bit();
+}
+
+KPlatformArchitecture UIGuestOSTypeManager::getPlatformArchitecture(const QString &strTypeId) const
+{
+    return m_guestOSTypes.value(m_typeIdIndexMap.value(strTypeId, -1)).getPlatformArchitecture();
+}
+
 /* static */
 bool UIGuestOSTypeManager::isDOSType(const QString &strOSTypeId)
@@ -321 +332 @@
     return KStorageControllerType_Null;
 }
+
+bool UIGuestOSType::is64Bit() const
+{
+    if (m_comGuestOSType.isOk())
+        return m_comGuestOSType.GetIs64Bit();
+    return false;
+}
+
+KPlatformArchitecture UIGuestOSType::getPlatformArchitecture() const
+{
+    if (m_comGuestOSType.isOk())
+        return m_comGuestOSType.GetPlatformArchitecture();
+    return KPlatformArchitecture_Max;
+}

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

@@ -70 +70 @@
         KGraphicsControllerType getRecommendedGraphicsController() const;
         KStorageControllerType  getRecommendedDVDStorageController() const;
+        bool                    is64Bit() const;
+        KPlatformArchitecture   getPlatformArchitecture() const;
     /** @} */
 
@@ -136 +138 @@
         bool                    isLinux(const QString &strTypeId) const;
         bool                    isWindows(const QString &strTypeId) const;
+        bool                    is64Bit(const QString &strOSTypeId) const;
+        KPlatformArchitecture   getPlatformArchitecture(const QString &strTypeId) const;
     /** @} */
 

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

@@ -35 +35 @@
 
 /* GUI includes: */
+#include "UICommon.h"
 #include "UIIconPool.h"
 #include "UIExtraDataManager.h"
+#include "UIGuestOSType.h"
 #include "UIModalWindowManager.h"
 
@@ -781 +783 @@
 
 /* static */
-QString UIIconPoolGeneral::determineOSArchString(const QString &osTypeId)
-{
-    if (osTypeId.contains("_x64") || osTypeId.contains("_64"))
-        return QString("x64");
-    else if (osTypeId.contains("arm32"))
-        return QString("A32");
-    else if (osTypeId.contains("arm64"))
-        return QString("A64");
-    return QString("32");
+QString UIIconPoolGeneral::determineOSArchString(const QString &strOSTypeId)
+{
+    bool fIs64Bit = uiCommon().guestOSTypeManager().is64Bit(strOSTypeId);
+    KPlatformArchitecture enmPlatformArchitecture = uiCommon().guestOSTypeManager().getPlatformArchitecture(strOSTypeId);
+
+    if (enmPlatformArchitecture == KPlatformArchitecture_ARM)
+    {
+        if (fIs64Bit)
+            return QString("A64");
+        else
+            return QString("A32");
+    }
+    else if (enmPlatformArchitecture == KPlatformArchitecture_x86)
+    {
+        if (fIs64Bit)
+            return QString("x64");
+        else
+            return QString("32");
+    }
+    return QString();
 }
 

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

@@ -177 +177 @@
     static void overlayArchitectureTextOnPixmap(const QString &strArch, QPixmap &pixmap);
     /** Returns the architecture text we overlay on guest OS type id icon.*/
-    static QString determineOSArchString(const QString &osTypeId);
+    static QString determineOSArchString(const QString &strOSTypeId);
     /** Holds the singleton instance. */
     static UIIconPoolGeneral *s_pInstance;