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

Timestamp:

May 27, 2014 8:03:54 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: HiDPI: Integrate VM-information-dialog icons.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMInfoDialog.cpp (modified) (4 diffs)
• UIVMInfoDialog.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -330 +330 @@
 {
     /* Details page update: */
-    m_browsers[0]->setText(vboxGlobal().detailsReport(m_session.GetMachine(), false /* with links */));
+    setText(m_browsers[0], vboxGlobal().detailsReport(m_session.GetMachine(), false /* with links */));
 }
 
@@ -565 +565 @@
     /* Prepare templates: */
     QString strTable = "<table width=100% cellspacing=1 cellpadding=0>%1</table>";
-    QString strHeader = "<tr><td width=22><img src='%1'></td>"
+    QString strHeader = "<tr><td width=22><img width=16 height=16 src='%1'></td>"
                         "<td colspan=2><nobr><b>%2</b></nobr></td></tr>";
     QString strParagraph = "<tr><td colspan=3></td></tr>";
@@ -788 +788 @@
     /* Show full composed page & save/restore scroll-bar position: */
     int iScrollBarValue = m_browsers[1]->verticalScrollBar()->value();
-    m_browsers[1]->setText(strTable.arg(strResult));
+    setText(m_browsers[1], strResult);
     m_browsers[1]->verticalScrollBar()->setValue(iScrollBarValue);
 }
@@ -875 +875 @@
 }
 
+/* static */
+void UIVMInfoDialog::setText(QRichTextEdit *pTextEdit, QString strText)
+{
+    /* Temporary replace ":/tpixel.png" with "__tpixel__": */
+    strText.replace(":/tpixel.png", "__tpixel__");
+    /* Search for all the mentioned pixmaps: */
+    QRegExp exp(":/([^/]+.png)");
+    exp.setMinimal(true);
+    /* Initialize iterator: */
+    int iPos = exp.indexIn(strText);
+    while (iPos != -1)
+    {
+        /* Replace pixmap record with HiDPI-aware analog: */
+        strText.replace(iPos, 2, "pixmaps://");
+        /* Load HiDPI-aware pixmap: */
+        QPixmap pixmap = UIIconPool::pixmap(exp.cap(0));
+        /* Register loaded pixmap in text-edit' document: */
+        pTextEdit->document()->addResource(QTextDocument::ImageResource,
+                                           QUrl(QString("pixmaps://%1").arg(exp.cap(1))), QVariant(pixmap));
+        /* Advance iterator: */
+        iPos = exp.indexIn(strText);
+    }
+    /* Replace "__tpixel__" with ":/tpixel.png" back: */
+    strText.replace("__tpixel__", ":/tpixel.png");
+    /* Assign text finally: */
+    pTextEdit->setText(strText);
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.h

@@ -118 +118 @@
     QString composeArticle(const QString &strBelongsTo, int iSpacesCount = 0);
 
+    /** Helper to set @a strText with HiDPI-aware pixmaps to corresponding @a pTextEdit. */
+    static void setText(QRichTextEdit *pTextEdit, QString strText);
+
     /** @name General variables.
      * @{ */

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

@@ -1113 +1113 @@
         "<table border=0 cellspacing=1 cellpadding=0>%1</table>";
     static const char *sSectionHrefTpl =
-        "<tr><td width=22 rowspan=%1 align=left><img src='%2'></td>"
+        "<tr><td width=22 rowspan=%1 align=left><img width=16 height=16 src='%2'></td>"
             "<td colspan=3><b><a href='%3'><nobr>%4</nobr></a></b></td></tr>"
             "%5"
         "<tr><td colspan=3><font size=1>&nbsp;</font></td></tr>";
     static const char *sSectionBoldTpl =
-        "<tr><td width=22 rowspan=%1 align=left><img src='%2'></td>"
+        "<tr><td width=22 rowspan=%1 align=left><img width=16 height=16 src='%2'></td>"
             "<td colspan=3><!-- %3 --><b><nobr>%4</nobr></b></td></tr>"
             "%5"