Changeset 101590 in vbox

Timestamp:

Oct 25, 2023 12:54:48 PM (19 months ago)

Author:

vboxsync

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

159671

Message:

FE/Qt: bugref:10535. Overlay icons rather than pixmaps to have the arch. text on window title icons etc.

Location:

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

Files:

• UIIconPool.cpp (modified) (4 diffs)
• UIIconPool.h (modified) (2 diffs)

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

@@ -554 +554 @@
 }
 
+/* static */
+QIcon UIIconPoolGeneral::overlayedIconSet(const QString &strGuestOSTypeId,
+                                          const QString &strNormal,
+                                          const QString &strDisabled /* = QString() */,
+                                          const QString &strActive /* = QString() */)
+{
+    /* Prepare fallback icon: */
+    static QIcon nullIcon;
+
+    /* Prepare icon: */
+    QIcon icon;
+
+    /* Add 'normal' pixmap: */
+    AssertReturn(!strNormal.isEmpty(), nullIcon);
+    addNameAndOverlay(icon, strNormal, strGuestOSTypeId, QIcon::Normal);
+
+    /* Add 'disabled' pixmap (if any): */
+    if (!strDisabled.isEmpty())
+        addNameAndOverlay(icon, strDisabled, strGuestOSTypeId, QIcon::Disabled);
+
+    /* Add 'active' pixmap (if any): */
+    if (!strActive.isEmpty())
+        addNameAndOverlay(icon, strActive, strGuestOSTypeId, QIcon::Active);
+
+    /* Return icon: */
+    return icon;
+}
+
+/* static */
+void UIIconPoolGeneral::addNameAndOverlay(QIcon &icon, const QString &strName, const QString &strGuestOSTypeId,
+                                QIcon::Mode mode /* = QIcon::Normal */, QIcon::State state /* = QIcon::Off */ )
+{
+    /* Prepare pixmap on the basis of passed value: */
+    QPixmap pixmap(strName);
+    overlayArchitectureTextOnPixmap(determineOSArchString(strGuestOSTypeId), pixmap);
+    /* Add pixmap: */
+    icon.addPixmap(pixmap, mode, state);
+
+    /* Parse name to prefix and suffix: */
+    QString strPrefix = strName.section('.', 0, -2);
+    QString strSuffix = strName.section('.', -1, -1);
+    /* Prepare HiDPI pixmaps: */
+    const QStringList aPixmapNames = QStringList() << (strPrefix + "_x2." + strSuffix)
+                                                   << (strPrefix + "_x3." + strSuffix)
+                                                   << (strPrefix + "_x4." + strSuffix);
+    foreach (const QString &strPixmapName, aPixmapNames)
+    {
+        QPixmap pixmapHiDPI(strPixmapName);
+        if (!pixmapHiDPI.isNull())
+        {
+            overlayArchitectureTextOnPixmap(determineOSArchString(strGuestOSTypeId), pixmapHiDPI);
+            icon.addPixmap(pixmapHiDPI, mode, state);
+        }
+    }
+}
+
 QIcon UIIconPoolGeneral::userMachineIcon(const CMachine &comMachine) const
 {
@@ -654 +710 @@
         /* Compose proper icon if we have that 'guest OS type' known: */
         if (m_guestOSTypeIconNames.contains(strOSTypeID))
-            m_guestOSTypeIcons[strOSTypeID] = iconSet(m_guestOSTypeIconNames[strOSTypeID]);
+            m_guestOSTypeIcons[strOSTypeID] = overlayedIconSet(strOSTypeID, m_guestOSTypeIconNames[strOSTypeID]);
         /* Assign fallback icon if we do NOT have that 'guest OS type' registered: */
         else if (!strOSTypeID.isNull())
-            m_guestOSTypeIcons[strOSTypeID] = iconSet(m_guestOSTypeIconNames[GUEST_OS_ID_STR_X86("Other")]);
+            m_guestOSTypeIcons[strOSTypeID] = overlayedIconSet(strOSTypeID, m_guestOSTypeIconNames[GUEST_OS_ID_STR_X86("Other")]);
         /* Assign fallback icon if we do NOT have that 'guest OS type' known: */
         else
@@ -720 +776 @@
     }
 
-    overlayArchitectureTextOnPixmap(determineOSArchString(strOSTypeID), pixmap);
     /* Return pixmap: */
     return pixmap;
 }
 
-QString UIIconPoolGeneral::determineOSArchString(const QString &osTypeId) const
+/* static */
+QString UIIconPoolGeneral::determineOSArchString(const QString &osTypeId)
 {
     if (osTypeId.contains("_x64") || osTypeId.contains("_64"))
@@ -736 +792 @@
 }
 
-void UIIconPoolGeneral::overlayArchitectureTextOnPixmap(const QString &strArch, QPixmap &pixmap) const
+/* static */
+void UIIconPoolGeneral::overlayArchitectureTextOnPixmap(const QString &strArch, QPixmap &pixmap)
 {
 #if 0

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

@@ -160 +160 @@
 private:
 
+    /** Creates icon from passed pixmap names for
+      * @a strNormal, @a strDisabled and @a strActive icon states. Utilizes addNameAndOverlay to overlay pixmaps. */
+    static QIcon overlayedIconSet(const QString &strGuestOSTypeId,
+                                  const QString &strNormal,
+                                  const QString &strDisabled = QString(),
+                                  const QString &strActive = QString());
+    /* Just like UIIconPool::addName add resources to icon but additionally overlays corresponding text wrt. strGuestOSTypeId. */
+    static void addNameAndOverlay(QIcon &icon, const QString &strName, const QString &strGuestOSTypeId,
+                        QIcon::Mode mode = QIcon::Normal, QIcon::State state = QIcon::Off);
+
     /** Constructs general icon-pool. */
     UIIconPoolGeneral();
@@ -165 +175 @@
     virtual ~UIIconPoolGeneral() /* override final */;
     /** Overlay text @p strArch on top of @p pixmap. */
-    void overlayArchitectureTextOnPixmap(const QString &strArch, QPixmap &pixmap) const;
+    static void overlayArchitectureTextOnPixmap(const QString &strArch, QPixmap &pixmap);
     /** Returns the architecture text we overlay on guest OS type id icon.*/
-    QString determineOSArchString(const QString &osTypeId) const;
+    static QString determineOSArchString(const QString &osTypeId);
     /** Holds the singleton instance. */
     static UIIconPoolGeneral *s_pInstance;