Changeset 35424 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 7, 2011 1:05:41 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: change the layout of the beta label and add it to the VM window

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIImageTools.cpp (modified) (4 diffs)
• globals/UIImageTools.h (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.h (modified) (2 diffs)
• runtime/UIMachineMenuBar.cpp (modified) (3 diffs)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• runtime/scale/UIMachineWindowScale.cpp (modified) (2 diffs)
• widgets/UIBar.cpp (modified) (1 diff)

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

@@ -204 +204 @@
 }
 
-QPixmap betaLabel()
+static QImage betaLabelImage(const QSize& ls)
 {
     /* Beta label */
-    QSize ls(80, 16);
     QColor bgc(246, 179, 0);
     QImage i(ls, QImage::Format_ARGB32);
@@ -218 +217 @@
     p.drawRect(0, 0, ls.width(), ls.height());
     /* The black stripes */
-    p.setPen(QPen(QColor(70, 70, 70), 3));
-    int c = 6;
+    p.setPen(QPen(QColor(70, 70, 70), 5));
+    float c = ((float)ls.width() / ls.height()) + 1;
     float g = (ls.width() / (c - 1));
     for (int i = 0; i < c; ++i)
@@ -239 +238 @@
     p.drawPath(tp);
     p.end();
+
+    /* Smoothing */
+    QImage i1(ls, QImage::Format_ARGB32);
+    i1.fill(Qt::transparent);
+    QPainter p1(&i1);
+    p1.setCompositionMode(QPainter::CompositionMode_Source);
+    p1.drawImage(0, 0, i);
+    p1.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    QLinearGradient lg(0, 0, ls.width(), 0);
+    lg.setColorAt(0, QColor(Qt::transparent));
+    lg.setColorAt(0.20, QColor(Qt::white));
+    lg.setColorAt(0.80, QColor(Qt::white));
+    lg.setColorAt(1, QColor(Qt::transparent));
+    p1.fillRect(0, 0, ls.width(), ls.height(), lg);
+    p1.end();
+
+    return i1;
+}
+
+QPixmap betaLabel(const QSize &ls /* = QSize(80, 16) */)
+{
+    return QPixmap::fromImage(betaLabelImage(ls));
+}
+
+QPixmap betaLabelSleeve(const QSize &ls /* = QSize(80, 16) */)
+{
+    const QImage &i = betaLabelImage(ls);
     /* Create a secondary image which will contain the rotated banner. */
     int w = sqrtf(powf(ls.width(), 2) / 2);
@@ -245 +271 @@
     QPainter p1(&i1);
     p1.setRenderHints(QPainter::SmoothPixmapTransform);
-    p1.translate(0, w);
-    p1.rotate(-45);
-    p1.drawImage(0, 0, i);
+    p1.rotate(45);
+    p1.drawImage(0, -ls.height(), i);
     p1.end();
 

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

@@ -29 +29 @@
 void blurImageVertical(const QImage &source, QImage &dest, int r);
 
-QPixmap betaLabel();
+QPixmap betaLabel(const QSize &ls = QSize(80, 16));
+QPixmap betaLabelSleeve(const QSize &ls = QSize(80, 16));
 
 #endif /* !__UIImageTools_h__ */

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -96 +96 @@
 }
 
-void darwinLabelToolbar(NativeNSWindowRef pWindow, NativeNSImageRef pImage)
-{
-    NSToolbar *tb = [pWindow toolbar];
-    if ([tb respondsToSelector:@selector(_toolbarView)])
-    {
-        NSView *tbv = [tb performSelector:@selector(_toolbarView)];
-        if (tbv)
-        {
-            NSSize s = [pImage size];
-            NSSize s1 = [tbv frame].size;
-            NSImageView *iv = [[NSImageView alloc] initWithFrame:NSMakeRect(s1.width - s.width, s1.height - s.height - 1, s.width, s.height)];
-            [iv setImage:pImage];
-            [iv setAutoresizesSubviews:true];
-            [iv setAutoresizingMask:NSViewMinXMargin | NSViewMaxYMargin];
-            [tbv addSubview:iv positioned:NSWindowBelow relativeTo:nil];
-        }
+void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, bool fCenter)
+{
+    /* Get the parent view of the close button. */
+    NSView *wv = [[pWindow standardWindowButton:NSWindowCloseButton] superview];
+    if (wv)
+    {
+        /* We have to calculate the size of the title bar for the center case. */
+        NSSize s = [pImage size];
+        NSSize s1 = [wv frame].size;
+        NSSize s2 = [[pWindow contentView] frame].size;
+        /* Correctly position the label. */
+        NSImageView *iv = [[NSImageView alloc] initWithFrame:NSMakeRect(s1.width - s.width - (fCenter ? 10 : 0),
+                                                                        fCenter ? s2.height + (s1.height - s2.height - s.height) / 2 : s1.height - s.height - 1,
+                                                                        s.width, s.height)];
+        /* Configure the NSImageView for auto moving. */
+        [iv setImage:pImage];
+        [iv setAutoresizesSubviews:true];
+        [iv setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
+        /* Add it to the parent of the close button. */
+        [wv addSubview:iv positioned:NSWindowBelow relativeTo:nil];
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -67 +67 @@
 }
 
-void darwinLabelToolbar(QWidget *pWidget, QPixmap *pPixmap)
-{
-    ::darwinLabelToolbar(::darwinToNativeWindow(pWidget), ::darwinToNSImageRef(pPixmap));
+void darwinLabelWindow(QWidget *pWidget, QPixmap *pPixmap, bool fCenter)
+{
+    ::darwinLabelWindow(::darwinToNativeWindow(pWidget), ::darwinToNSImageRef(pPixmap), fCenter);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

@@ -59 +59 @@
 void darwinSetShowsResizeIndicatorImpl(NativeNSWindowRef pWindow, bool fEnabled);
 void darwinSetHidesAllTitleButtonsImpl(NativeNSWindowRef pWindow);
-void darwinLabelToolbar(NativeNSWindowRef pWindow, NativeNSImageRef pImage);
+void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, bool fCenter);
 void darwinSetShowsWindowTransparentImpl(NativeNSWindowRef pWindow, bool fEnabled);
 void darwinSetMouseCoalescingEnabled(bool fEnabled);
@@ -175 +175 @@
  ********************************************************************************/
 void darwinSetShowsToolbarButton(QToolBar *aToolBar, bool fEnabled);
-void darwinLabelToolbar(QWidget *pWidget, QPixmap *pPixmap);
+void darwinLabelWindow(QWidget *pWidget, QPixmap *pPixmap, bool fCenter);
 void darwinSetShowsResizeIndicator(QWidget *pWidget, bool fEnabled);
 void darwinSetHidesAllTitleButtons(QWidget *pWidget);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp

@@ -25 +25 @@
 #include "VBoxProblemReporter.h"
 #include "UIExtraDataEventHandler.h"
+#include "UIImageTools.h"
 
 /* Global includes */
 #include <QMenuBar>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPixmapCache>
 
 /* Helper QMenu reimplementation which allows
@@ -48 +52 @@
         QMenu::focusNextChild();
     }
+};
+
+class UIMenuBar: public QMenuBar
+{
+public:
+
+    UIMenuBar(QWidget *pParent = 0)
+      : QMenuBar(pParent)
+      , m_fShowBetaLabel(false)
+    {
+        /* Check for beta versions */
+        if (vboxGlobal().isBeta())
+            m_fShowBetaLabel = true;
+    }
+
+protected:
+
+    void paintEvent(QPaintEvent *pEvent)
+    {
+        QMenuBar::paintEvent(pEvent);
+        if (m_fShowBetaLabel)
+        {
+            QPixmap betaLabel;
+            const QString key("vbox:betaLabel");
+            if (!QPixmapCache::find(key, betaLabel))
+            {
+                betaLabel = ::betaLabel();
+                QPixmapCache::insert(key, betaLabel);
+            }
+            QSize s = size();
+            QPainter painter(this);
+            painter.setClipRect(pEvent->rect());
+            painter.drawPixmap(s.width() - betaLabel.width() - 10, (height() - betaLabel.height()) / 2, betaLabel);
+        }
+    }
+
+private:
+
+    /* Private member vars */
+    bool m_fShowBetaLabel;
 };
 
@@ -73 +117 @@
 {
     /* Create empty menubar: */
-    QMenuBar *pMenuBar = new QMenuBar;
+    QMenuBar *pMenuBar = new UIMenuBar;
 
     /* Fill menubar with prepared items: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -39 +39 @@
 #include "UIDownloaderAdditions.h"
 #include "UIDownloaderUserManual.h"
+#ifdef Q_WS_MAC
+# include "UIImageTools.h"
+#endif /* Q_WS_MAC */
 
 #include "QIStatusBar.h"
@@ -89 +92 @@
     /* Update all the elements: */
     updateAppearanceOf(UIVisualElement_AllStuff);
+
+#ifdef Q_WS_MAC
+    /* Beta label? */
+    if (vboxGlobal().isBeta())
+    {
+        QPixmap betaLabel = ::betaLabel(QSize(100, 16));
+        ::darwinLabelWindow(this, &betaLabel, true);
+    }
+#endif /* Q_WS_MAC */
 
     /* Show window: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -34 +34 @@
 #include "UIMachineView.h"
 #include "UIMachineWindowScale.h"
+#ifdef Q_WS_MAC
+# include "UIImageTools.h"
+#endif /* Q_WS_MAC */
 
 UIMachineWindowScale::UIMachineWindowScale(UIMachineLogic *pMachineLogic, ulong uScreenId)
@@ -73 +76 @@
     /* Update all the elements: */
     updateAppearanceOf(UIVisualElement_AllStuff);
+
+#ifdef Q_WS_MAC
+    /* Beta label? */
+    if (vboxGlobal().isBeta())
+    {
+        QPixmap betaLabel = ::betaLabel(QSize(100, 16));
+        ::darwinLabelWindow(this, &betaLabel, true);
+    }
+#endif /* Q_WS_MAC */
+
 
     /* Show window: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp

@@ -122 +122 @@
 {
     UIBar::paintEvent(pEvent);
-    QPainter painter(this);
-    painter.setClipRect(pEvent->rect());
-
     if (m_fShowBetaLabel)
     {
         QPixmap betaLabel;
-        const QString key("vbox:betaLabel");
+        const QString key("vbox:betaLabelSleeve");
         if (!QPixmapCache::find(key, betaLabel))
         {
-            betaLabel = ::betaLabel();
+            betaLabel = ::betaLabelSleeve();
             QPixmapCache::insert(key, betaLabel);
         }
         QSize s = size();
-        painter.drawPixmap(s.width() - betaLabel.width(), s.height() - betaLabel.height() - 1, betaLabel);
+        QPainter painter(this);
+        painter.setClipRect(pEvent->rect());
+        painter.drawPixmap(s.width() - betaLabel.width(), 0, betaLabel);
     }
 }