Changeset 45223 in vbox for trunk/src

Timestamp:

Mar 28, 2013 9:01:39 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM selector: Preview-frame experimental rework.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• images/preview_empty_228x168px.png (added)
• images/preview_full_228x168px.png (added)
• src/selector/graphics/details/UIGMachinePreview.cpp (modified) (9 diffs)
• src/selector/graphics/details/UIGMachinePreview.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -192 +192 @@
         <file alias="previous_16px.png">images/previous_16px.png</file>
         <file alias="expanding_collapsing_16px.png">images/expanding_collapsing_16px.png</file>
+        <file alias="preview_empty_228x168px.png">images/preview_empty_228x168px.png</file>
+        <file alias="preview_full_228x168px.png">images/preview_full_228x168px.png</file>
     </qresource>
 </RCC>

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -52 +52 @@
     , m_pUpdateTimer(new QTimer(this))
     , m_pUpdateTimerMenu(0)
-    , m_vMargin(10)
-    , m_pbgImage(0)
+    , m_iMargin(0)
+    , m_pbgEmptyImage(0)
+    , m_pbgFullImage(0)
     , m_pPreviewImg(0)
-    , m_pGlossyImg(0)
 {
     /* Setup contents: */
@@ -62 +62 @@
     /* Create session instance: */
     m_session.createInstance(CLSID_Session);
+
+    /* Create bg images: */
+    m_pbgEmptyImage = new QPixmap(":/preview_empty_228x168px.png");
+    m_pbgFullImage = new QPixmap(":/preview_full_228x168px.png");
 
     /* Create the context menu: */
@@ -99 +103 @@
     if (m_session.GetState() == KSessionState_Locked)
         m_session.UnlockMachine();
-    if (m_pbgImage)
-        delete m_pbgImage;
-    if (m_pGlossyImg)
-        delete m_pGlossyImg;
+    delete m_pbgEmptyImage;
+    delete m_pbgFullImage;
     if (m_pPreviewImg)
         delete m_pPreviewImg;
@@ -226 +228 @@
 void UIGMachinePreview::resizeEvent(QGraphicsSceneResizeEvent *pEvent)
 {
-    repaintBGImages();
+    recalculatePreviewRectangle();
     sltRecreatePreview();
     QIGraphicsWidget::resizeEvent(pEvent);
@@ -267 +269 @@
 {
     if (which == Qt::MinimumSize)
-        return QSize(220, (int)(220 * 3.0/4.0));
+        return QSize(228 /* pixmap width */ + 2 * m_iMargin,
+                     168 /* pixmap height */ + 2 * m_iMargin);
     return QIGraphicsWidget::sizeHint(which, constraint);
 }
@@ -277 +280 @@
     if (!cr.isValid())
         return;
-    /* Draw the background with the monitor and the shadow: */
-    if (m_pbgImage)
-        pPainter->drawImage(cr.x(), cr.y(), *m_pbgImage);
 
     /* If there is a preview image available: */
     if (m_pPreviewImg)
     {
+        /* Draw empty background: */
+        pPainter->drawPixmap(cr.x() + m_iMargin, cr.y() + m_iMargin, *m_pbgEmptyImage);
+
         /* Draw that image: */
         pPainter->drawImage(0, 0, *m_pPreviewImg);
@@ -289 +292 @@
     else
     {
-        /* Fill rectangle with black color: */
-        pPainter->fillRect(m_vRect, Qt::black);
+        /* Draw full background: */
+        pPainter->drawPixmap(cr.x() + m_iMargin, cr.y() + m_iMargin, *m_pbgFullImage);
 
         /* Compose name: */
@@ -317 +320 @@
         pPainter->drawText(m_vRect, fFlags, strName);
     }
-
-    /* Draw the glossy overlay last: */
-    if (m_pGlossyImg)
-        pPainter->drawImage(m_vRect.x(), m_vRect.y(), *m_pGlossyImg);
 }
 
@@ -370 +369 @@
 }
 
-void UIGMachinePreview::repaintBGImages()
-{
-    /* Delete the old images: */
-    if (m_pbgImage)
-    {
-        delete m_pbgImage;
-        m_pbgImage = 0;
-    }
-    if (m_pGlossyImg)
-    {
-        delete m_pGlossyImg;
-        m_pGlossyImg = 0;
-    }
-
-    /* Check that there is enough room for our fancy stuff.
-     * If not we just draw nothing (the border and the blur radius). */
+void UIGMachinePreview::recalculatePreviewRectangle()
+{
+    /* Contents rectangle: */
     QRect cr = contentsRect().toRect();
-    if (cr.width()  < 41 || cr.height() < 41)
-        return;
-
-    QPalette pal = palette();
-    m_wRect = cr.adjusted(10, 10, -10, -10);
-    m_vRect = m_wRect.adjusted(m_vMargin, m_vMargin, -m_vMargin, -m_vMargin).adjusted(-3, -3, 3, 3);
-
-    /* First draw the shadow. Its a rounded rectangle which get blurred: */
-    QImage imageW(cr.size(), QImage::Format_ARGB32);
-    QColor bg = pal.color(QPalette::Base);
-    bg.setAlpha(0); /* We want blur to transparent _and_ whatever the base color is. */
-    imageW.fill(bg.rgba());
-    QPainter pW(&imageW);
-    pW.setBrush(QColor(30, 30, 30)); /* Dark gray */
-    pW.setPen(Qt::NoPen);
-    pW.drawRoundedRect(QRect(QPoint(0, 0), cr.size()).adjusted(10, 10, -10, -10), m_vMargin, m_vMargin);
-    pW.end();
-    /* Blur the rectangle */
-    QImage imageO(cr.size(), QImage::Format_ARGB32);
-    blurImage(imageW, imageO, 10);
-    QPainter pO(&imageO);
-
-    /* Now paint the border with a gradient to get a look of a monitor: */
-    QRect rr = QRect(QPoint(0, 0), cr.size()).adjusted(10, 10, -10, -10);
-    QLinearGradient lg(0, rr.y(), 0, rr.height());
-    QColor base(200, 200, 200); /* light variant */
-    // QColor base(80, 80, 80); /* Dark variant */
-    lg.setColorAt(0, base);
-    lg.setColorAt(0.4, base.darker(300));
-    lg.setColorAt(0.5, base.darker(400));
-    lg.setColorAt(0.7, base.darker(300));
-    lg.setColorAt(1, base);
-    pO.setBrush(lg);
-    pO.setPen(QPen(base.darker(150), 1));
-    pO.drawRoundedRect(rr, m_vMargin, m_vMargin);
-    pO.end();
-
-    /* Make a copy of the new bg image: */
-    m_pbgImage = new QImage(imageO);
-
-    /* Now the glossy overlay has to be created.
-     * Start with defining a nice looking painter path. */
-    QRect gRect = QRect(QPoint(0, 0), m_vRect.size());
-    QPainterPath glossyPath(QPointF(gRect.x(), gRect.y()));
-    glossyPath.lineTo(gRect.x() + gRect.width(), gRect.y());
-    glossyPath.lineTo(gRect.x() + gRect.width(), gRect.y() + gRect.height() * 1.0/3.0);
-    glossyPath.cubicTo(gRect.x() + gRect.width() / 2.0, gRect.y() + gRect.height() * 1.0/3.0,
-                       gRect.x() + gRect.width() / 2.0, gRect.y() + gRect.height() * 2.0/3.0,
-                       gRect.x(), gRect.y() + gRect.height() * 2.0/3.0);
-    glossyPath.closeSubpath();
-
-    /* Paint the glossy path on a QImage: */
-    QImage image(m_vRect.size(), QImage::Format_ARGB32);
-    QColor bg1(Qt::white); /* We want blur to transparent _and_ white. */
-    bg1.setAlpha(0);
-    image.fill(bg1.rgba());
-    QPainter painter(&image);
-    painter.fillPath(glossyPath, QColor(255, 255, 255, 80));
-    painter.end();
-    /* Blur the image to get a much more smooth feeling */
-    QImage image1(m_vRect.size(), QImage::Format_ARGB32);
-    blurImage(image, image1, 7);
-    m_pGlossyImg = new QImage(image1);
-
-    /* Repaint: */
-    update();
+    m_vRect = cr.adjusted(21 + m_iMargin, 17 + m_iMargin, -21 - m_iMargin, -20 - m_iMargin);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h

@@ -35 +35 @@
 class QAction;
 class QImage;
+class QPixmap;
 class QMenu;
 class QTimer;
@@ -97 +98 @@
     /* Helpers: Update stuff: */
     void setUpdateInterval(UpdateInterval interval, bool fSave);
-    void repaintBGImages();
+    void recalculatePreviewRectangle();
     void restart();
     void stop();
@@ -108 +109 @@
     QMenu *m_pUpdateTimerMenu;
     QHash<UpdateInterval, QAction*> m_actions;
-    const int m_vMargin;
-    QRect m_wRect;
+    const int m_iMargin;
     QRect m_vRect;
-    QImage *m_pbgImage;
+    QPixmap *m_pbgEmptyImage;
+    QPixmap *m_pbgFullImage;
     QImage *m_pPreviewImg;
-    QImage *m_pGlossyImg;
     static UpdateIntervalMap m_intervals;
 };