Changeset 59643 in vbox

Timestamp:

Feb 12, 2016 10:43:21 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​bugref:8088: Rework session-information window: UIInformationItem classes cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIInformationItem.cpp (modified) (4 diffs)
• UIInformationItem.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp

@@ -21 +21 @@
 
 /* Qt includes: */
-# include <QDebug>
 # include <QPainter>
 # include <QApplication>
+# include <QAbstractTextDocumentLayout>
+# include <QTextDocument>
 
 /* GUI includes: */
@@ -32 +33 @@
 UIInformationItem::UIInformationItem(QObject *pParent)
     : QStyledItemDelegate(pParent)
-    , m_fontMetrics(QApplication::fontMetrics())
-    , m_iMinimumLeftColumnWidth(300)
-    , m_textpaneheight(20)
 {
+    m_pTextDocument = new QTextDocument(this);
 }
 
-void UIInformationItem::setIcon(const QIcon &icon) const
+void UIInformationItem::setIcon(const QString &strIcon) const
 {
-    /* Cache icon: */
-    if (icon.isNull())
-    {
-        /* No icon provided: */
-        m_pixmapSize = QSize();
-        m_pixmap = QPixmap();
-    }
-    else
-    {
-        /* Determine default the icon size: */
-        const QStyle *pStyle = QApplication::style();
-        const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
-        m_pixmapSize = QSize(iIconMetric, iIconMetric);
-        /* Acquire the icon of the corresponding size: */
-        m_pixmap = icon.pixmap(m_pixmapSize);
-    }
+    m_strIcon = strIcon;
+    updateTextLayout();
 }
 
@@ -62 +47 @@
     /* Cache name: */
     m_strName = strName;
-    m_nameSize = QSize(m_fontMetrics.width(m_strName), m_fontMetrics.height());
+    updateTextLayout();
 }
 
@@ -104 +89 @@
 void UIInformationItem::paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    /* Initialize some necessary variables: */
-    const int iMargin = 2;
-    const int iSpacing = 5;
+    pPainter->save();
+    updateData(index);
 
-    /* Item rect: */
-    const QRect optionRect = option.rect;
-    /* Palette: */
-    const QPalette pal = option.palette;
-    /* Font metrics: */
-    const QFontMetrics fm = option.fontMetrics;
+    QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &option, pPainter);
+    pPainter->resetTransform();
+    pPainter->translate(option.rect.topLeft());
 
-    const int iPositionX = optionRect.topLeft().x() + iMargin;
-    const int iPositionY = optionRect.topLeft().y() + iMargin;
-
-    /* Set Name: */
-    m_strName = index.data().toString();
-    m_nameSize = QSize(fm.width(m_strName), fm.height());
-
-    /* Set Icon: */
-    setIcon(QIcon(index.data(Qt::DecorationRole).toString()));
-
-    /* Paint pixmap: */
-    const int iElementPixmapX = iMargin + iPositionX;
-    const int iElementPixmapY = iPositionY;
-    pPainter->drawPixmap(QRect(QPoint(iElementPixmapX, iElementPixmapY), m_pixmapSize), m_pixmap);
-
-    /* Paint name: */
-    const int iNameX = iElementPixmapX + m_pixmapSize.width() + iSpacing;
-    const int iNameY = optionRect.topLeft().y();
-    QFont namefont = QApplication::font();
-    namefont.setWeight(QFont::Bold);
-    QPoint namePos(iNameX, iNameY);
-    namePos += QPoint(0, fm.ascent());
-    const QColor buttonTextColor = pal.color(QPalette::Active, QPalette::ButtonText);
-    pPainter->save();
-    pPainter->setFont(namefont);
-    pPainter->setPen(buttonTextColor);
-    pPainter->drawText(namePos, m_strName);
+    m_pTextDocument->drawContents(pPainter);
     pPainter->restore();
-    setText(index.data(Qt::UserRole+1).value<UITextTable>());
-
-    /* Layout text-pane: */
-    const int iTextPaneY = qMax(m_pixmapSize.height(), m_nameSize.height()) + iPositionY;
-    /* Draw all the text-layouts: */
-    foreach (QTextLayout *pTextLayout, m_leftList)
-        pTextLayout->draw(pPainter, QPoint(iNameX, iTextPaneY));
-    foreach (QTextLayout *pTextLayout, m_rightList)
-        pTextLayout->draw(pPainter, QPoint(iNameX, iTextPaneY));
-
-    m_textpaneheight = m_leftList.count() * fm.lineSpacing();
 }
 
-/*QSize UIInformationItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize UIInformationItem::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    const int iWidth = m_nameSize.width() + m_pixmapSize.width() + 10 + m_textpanewidth;
-    const int iHeight = qMax(m_pixmapSize.height(), m_nameSize.height())+ m_textpaneheight +20;
-    return QSize(iWidth, iHeight);
-}*/
+    updateData(index);
+    return m_pTextDocument->size().toSize();
+}
 
-QTextLayout* UIInformationItem::buildTextLayout(const QString &strText) const
+void UIInformationItem::updateData(const QModelIndex &index) const
 {
-    /* Create layout; */
-    QTextLayout *pTextLayout = new QTextLayout(strText);
+    setName(index.data().toString());
+    setIcon(index.data(Qt::DecorationRole).toString());
+    setText(index.data(Qt::UserRole+1).value<UITextTable>());
+    m_type = index.data(Qt::UserRole+2).value<InformationElementType>();
+}
 
-    /* Configure layout: */
-    QTextOption textOption;
-    textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
-    pTextLayout->setTextOption(textOption);
-
-    /* Build layout: */
-    pTextLayout->beginLayout();
-    while (1)
-    {
-        QTextLine line = pTextLayout->createLine();
-        if (!line.isValid())
-            break;
-    }
-    pTextLayout->endLayout();
-
-    /* Return layout: */
-    return pTextLayout;
+QString UIInformationItem::htmlData()
+{
+    return m_pTextDocument->toHtml();
 }
 
 void UIInformationItem::updateTextLayout() const
 {
-    /* Initialize text attributes: */
-    int iSpacing = 20;
+    /* Details templates */
+    static const char *sSectionBoldTpl =
+        "<tr><td width=22 rowspan=%1 align=left><img width=16 height=16 src='%2'></td>"
+            "<td><b><nobr>%3</nobr></b></td></tr>"
+            "%4";
+    static const char *sSectionItemTpl2 =
+        "<tr><td width=300><nobr>%1</nobr></td><td/><td>%2</td></tr>";
 
-    /* Clear old text-layouts: */
-    while (!m_leftList.isEmpty()) delete m_leftList.takeLast();
-    while (!m_rightList.isEmpty()) delete m_rightList.takeLast();
+    const QString &sectionTpl = sSectionBoldTpl;
 
-    /* Prepare new text-layouts: */
-    /* Left layout: */
-    int iTextY = 0;
-    foreach (const UITextTableLine &line, m_text)
+    /* Compose details report: */
+    QString report;
     {
-        if (!line.first.isEmpty())
-        {
-            m_leftList << buildTextLayout(line.first + ":");
-            m_leftList.last()->setPosition(QPointF(0, iTextY));
-        }
-        /* Indent Y: */
-        iTextY += m_fontMetrics.lineSpacing() + 1;
-        /* Re-calculate maximum width: */
-        m_iMinimumLeftColumnWidth = qMax(m_iMinimumLeftColumnWidth, m_fontMetrics.width(line.first));
+        QString item;
+        foreach (const UITextTableLine &line, m_text)
+            item = item + QString(sSectionItemTpl2).arg(line.first, line.second);
+
+        report = sectionTpl
+                  .arg(m_text.count() + 1) /* rows */
+                  .arg(m_strIcon, /* icon */
+                       m_strName, /* title */
+                       item); /* items */
     }
 
-    /* Right layout: */
-    iTextY = 0;
-    foreach (const UITextTableLine &line, m_text)
-    {
-        if (!line.second.isEmpty())
-        {
-            m_rightList << buildTextLayout(line.second);
-            m_rightList.last()->setPosition(QPointF(0 + m_iMinimumLeftColumnWidth + iSpacing, iTextY));
-            m_textpanewidth = qMax(0 + m_iMinimumLeftColumnWidth + iSpacing, m_textpanewidth);
-        }
-
-        /* Indent Y: */
-        iTextY += m_fontMetrics.lineSpacing() + 1;
-    }
+    /* Set html data: */
+    m_pTextDocument->setHtml(report);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.h

@@ -32 +32 @@
 /* Forward declarations: */
 class QTextLayout;
+class QTextDocument;
 
 /* Typedefs: */
@@ -51 +52 @@
 
     /** Defines the icon of information-item as @a icon. */
-    void setIcon(const QIcon &icon) const;
+    void setIcon(const QString &icon) const;
 
     /** Defines the name of information-item as @a strName. */
@@ -65 +66 @@
 
     /** Size-hint calculation routine. */
-    //QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+    /** Updates data for the item with @a index. */
+    void updateData(const QModelIndex &index) const;
+
+    /** returns html data. */
+    QString htmlData();
 
 private:
-    /** Builds text-layout using text @a strText. */
-    QTextLayout* buildTextLayout(const QString &strText) const;
-
     /** Updates text-layout. */
     void updateTextLayout() const;
 
     /** Holds the pixmap of information-item. */
-    mutable QPixmap m_pixmap;
+    mutable QString m_strIcon;
 
     /** Holds the name of information-item. */
     mutable QString m_strName;
 
-    /** Holds the size of pixmap of information-item. */
-    mutable QSize m_pixmapSize;
-
-    /** Holds the size of pixmap of information-item. */
-    mutable QSize m_nameSize;
-
-    /** Holds the font-metrics. */
-    QFontMetrics m_fontMetrics;
-    /** Holds the minimum-width. */
-    mutable int m_iMinimumLeftColumnWidth;
+    /** Holds the text-data of information-item. */
+    mutable UITextTable m_text;
 
     /** Holds the text-data of information-item. */
-    mutable UITextTable m_text;
-    /** Holds the left text-layout list. */
-    mutable QList<QTextLayout*> m_leftList;
-    /** Holds the right text-layout list. */
-    mutable QList<QTextLayout*> m_rightList;
+    mutable InformationElementType m_type;
 
-    /** Holds the width of text-pane. */
-    mutable int m_textpanewidth;
-    /** Holds the height of text-pane. */
-    mutable int m_textpaneheight;
+    /** Holds the instance of text-dcoument we create. */
+    QTextDocument *m_pTextDocument;
 };