Changeset 15804 in vbox for trunk/src/VBox

Timestamp:

Jan 5, 2009 2:55:35 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: new look of the dock preview icon

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBox.qrc (modified) (1 diff)
• images/dock_1.png (deleted)
• images/monitor.png (added)
• images/monitor_glossy.png (added)
• include/VBoxConsoleView.h (modified) (3 diffs)
• include/VBoxConsoleWnd.h (modified) (2 diffs)
• include/VBoxDockIconPreview.h (added)
• include/VBoxUtils.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (7 diffs)
• src/VBoxConsoleWnd.cpp (modified) (7 diffs)
• src/darwin/VBoxDockIconPreview.cpp (added)
• src/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -382 +382 @@
         src/darwin/DarwinKeyboard.cpp \
         src/darwin/VBoxUtils-darwin.cpp \
+        src/darwin/VBoxDockIconPreview.cpp \
         src/VBoxFBQuartz2D.cpp
-#       src/darwin/VBoxAquaStyle.cpp
 
 ifdef VBOX_WITH_ICHAT_THEATER

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

@@ -301 +301 @@
     <file alias="meditation_32px.png">images/meditation_32px.png</file>
     <file alias="welcome.png">images/welcome.png</file>
-    <file alias="dock_1.png">images/dock_1.png</file>
+    <file alias="monitor.png">images/monitor.png</file>
+    <file alias="monitor_glossy.png">images/monitor_glossy.png</file>
  </qresource>
  </RCC>

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h

@@ -45 +45 @@
 class MousePointerChangeEvent;
 class VBoxFrameBuffer;
+class VBoxDockIconPreview;
 
 class QPainter;
@@ -128 +129 @@
 #if defined(Q_WS_MAC)
     void updateDockIcon();
+    void updateDockOverlay();
     void setDockIconEnabled (bool aOn) { mDockIconEnabled = aOn; };
     void setMouseCoalescingEnabled (bool aOn);
@@ -323 +325 @@
     QPixmap mPausedShot;
 #if defined(Q_WS_MAC)
-    CGImageRef mVirtualBoxLogo;
+    VBoxDockIconPreview *mDockIconPreview;
     bool mDockIconEnabled;
 #endif

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -111 +111 @@
     void clearMask();
 
-#if defined (Q_WS_MAC)
-    CGImageRef dockImageState () const;
-#endif
+    KMachineState machineState() const { return machine_state; }
 
 public slots:
@@ -372 +370 @@
     QRect mNormalGeometry;
     Qt::WindowFlags mSavedFlags;
-    /* Dock images */
-    CGImageRef dockImgStatePaused;
-    CGImageRef dockImgStateSaving;
-    CGImageRef dockImgStateRestoring;
-    CGImageRef dockImgBack100x75;
-    CGImageRef dockImgOS;
     /* For the fade effect if the the window goes fullscreen */
     CGDisplayFadeReservationToken mFadeToken;

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxUtils.h

@@ -209 +209 @@
 QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
 
-/* Special routines for the dock handling */
-CGImageRef darwinCreateDockBadge (const char *aSource);
-void darwinUpdateDockPreview (QWidget *aMainWindow, CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage = NULL);
-void darwinUpdateDockPreview (QWidget *aMainWindow, VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage, CGImageRef aStateImage = NULL);
-
 /* Icons in the menu of an mac application are unusual. */
 void darwinDisableIconsInMenus();

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

@@ -80 +80 @@
 
 #if defined (Q_WS_MAC)
+# include "VBoxDockIconPreview.h"
 # include "DarwinKeyboard.h"
 # ifdef VBOX_WITH_HACKED_QT
@@ -670 +671 @@
     , mDarwinKeyModifiers (0)
     , mKeyboardGrabbed (false)
-    , mVirtualBoxLogo (NULL)
     , mDockIconEnabled (true)
 #endif
@@ -683 +683 @@
 #ifdef Q_WS_MAC
     /* Overlay logo for the dock icon */
-    mVirtualBoxLogo = ::darwinToCGImageRef ("VirtualBox_cube_42px.png");
+    //mVirtualBoxLogo = ::darwinToCGImageRef ("VirtualBox_cube_42px.png");
+    QString osTypeId = mConsole.GetGuest().GetOSTypeId();
+    mDockIconPreview = new VBoxDockIconPreview (mMainWnd, vboxGlobal().vmGuestOSTypeIcon (osTypeId));
 
     /* Install the event handler which will proceed external window handling */
@@ -885 +887 @@
         mDarwinWindowOverlayHandlerRef = NULL;
     }
-    CGImageRelease (mVirtualBoxLogo);
+    delete mDockIconPreview;
 #endif
 }
@@ -3903 +3905 @@
     {
         if (!mPausedShot.isNull())
+        {
+            CGImageRef pauseImg = ::darwinToCGImageRef (&mPausedShot);
             /* Use the pause image as background */
-            ::darwinUpdateDockPreview (mMainWnd, ::darwinToCGImageRef (&mPausedShot), mVirtualBoxLogo, mMainWnd->dockImageState());
+            mDockIconPreview->updateDockPreview (pauseImg);
+            CGImageRelease (pauseImg);
+        }
         else
         {
@@ -3913 +3919 @@
                  * of the framebuffer for the dock icon creation. This saves
                  * some conversion time. */
-                ::darwinUpdateDockPreview (mMainWnd, static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef(), mVirtualBoxLogo, mMainWnd->dockImageState());
+                mDockIconPreview->updateDockPreview (static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef());
             }
             else
@@ -3919 +3925 @@
                 /* In image mode we have to create the image ref out of the
                  * framebuffer */
-                ::darwinUpdateDockPreview (mMainWnd, mFrameBuf, mVirtualBoxLogo, mMainWnd->dockImageState());
-        }
-    }
+                mDockIconPreview->updateDockPreview (mFrameBuf);
+        }
+    }
+}
+
+void VBoxConsoleView::updateDockOverlay()
+{
+    if (mDockIconEnabled)
+        updateDockIcon();
+    else
+        mDockIconPreview->updateDockOverlay ();
 }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -238 +238 @@
     , mDbgGui (NULL)
     , mDbgGuiVT (NULL)
-#endif
-#ifdef Q_WS_MAC
-    , dockImgStatePaused (NULL)
-    , dockImgStateSaving (NULL)
-    , dockImgStateRestoring (NULL)
-    , dockImgBack100x75 (NULL)
-    , dockImgOS (NULL)
 #endif
 {
@@ -694 +687 @@
     initSharedAVManager();
 # endif
-    /* prepare the dock images */
-    dockImgStatePaused    = ::darwinCreateDockBadge (":/state_paused_16px.png");
-    dockImgStateSaving    = ::darwinCreateDockBadge (":/state_saving_16px.png");
-    dockImgStateRestoring = ::darwinCreateDockBadge (":/state_restoring_16px.png");
-    dockImgBack100x75     = ::darwinCreateDockBadge (":/dock_1.png");
-    SetApplicationDockTileImage (dockImgOS);
 #endif
     mMaskShift.scale (0, 0, Qt::IgnoreAspectRatio);
@@ -707 +694 @@
 {
     closeView();
-
-#ifdef Q_WS_MAC
-    /* release the dock images */
-    if (dockImgStatePaused)
-        CGImageRelease (dockImgStatePaused);
-    if (dockImgStateSaving)
-        CGImageRelease (dockImgStateSaving);
-    if (dockImgStateRestoring)
-        CGImageRelease (dockImgStateRestoring);
-    if (dockImgBack100x75)
-        CGImageRelease (dockImgBack100x75);
-    if (dockImgOS)
-        CGImageRelease (dockImgOS);
-#endif
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -951 +924 @@
     bool f = (testStr.isEmpty() || testStr == "true");
     console->setDockIconEnabled (f);
-    if (f)
-    {
-        QString osTypeId = cmachine.GetOSTypeId();
-        QImage osImg100x75 = vboxGlobal().vmGuestOSTypeIcon (osTypeId).toImage().scaled (100, 75, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-        QImage osImg = QImage (":/dock_1.png");
-        QImage VBoxOverlay = QImage (":/VirtualBox_cube_42px.png");
-        QPainter painter (&osImg);
-        painter.drawImage (QPoint (14, 22), osImg100x75);
-        painter.drawImage (QPoint (osImg.width() - VBoxOverlay.width(), osImg.height() - VBoxOverlay.height()), VBoxOverlay);
-        painter.end();
-        if (dockImgOS)
-            CGImageRelease (dockImgOS);
-        dockImgOS = ::darwinToCGImageRef (&osImg);
-        SetApplicationDockTileImage (dockImgOS);
-    }
+    console->updateDockOverlay();
 #endif
 
@@ -2449 +2408 @@
 }
 
-#ifdef Q_WS_MAC
-CGImageRef VBoxConsoleWnd::dockImageState() const
-{
-    CGImageRef img;
-    if (machine_state == KMachineState_Paused)
-        img = dockImgStatePaused;
-    else if (machine_state == KMachineState_Restoring)
-        img = dockImgStateRestoring;
-    else if (machine_state == KMachineState_Saving)
-        img = dockImgStateSaving;
-    else
-        img = NULL;
-    return img;
-}
-#endif
-
 void VBoxConsoleWnd::changeDockIconUpdate (const VBoxChangeDockIconUpdateEvent &e)
 {
@@ -2471 +2414 @@
     {
         console->setDockIconEnabled (e.mChanged);
-        if (e.mChanged)
-            console->updateDockIcon();
-        else
-        {
-            RestoreApplicationDockTileImage();
-            CGImageRef img = dockImageState();
-            if (img)
-                OverlayApplicationDockTileImage (img);
-        }
+        console->updateDockOverlay();
     }
 #else
@@ -3487 +3422 @@
 
 #ifdef Q_WS_MAC
-    CGImageRef img = dockImageState();
-    if (img)
-        OverlayApplicationDockTileImage (img);
-    else
-        RestoreApplicationDockTileImage();
+    if (console)
+        console->updateDockOverlay();
 #endif
 }

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -140 +140 @@
     painter.end();
     return dragPixmap;
-}
-
-/**
- * Creates a dock badge image.
- *
- * The badge will be placed on the right hand size and vertically centered
- * after having been scaled up to 32x32.
- *
- * @returns CGImageRef for the new image. (Remember to release it when finished with it.)
- * @param   aSource     The source name.
- */
-CGImageRef darwinCreateDockBadge (const char *aSource)
-{
-    /* Create a transparent image in size 128x128. */
-    QImage transImage (128, 128, QImage::Format_ARGB32);
-    transImage.fill (qRgba (0, 0, 0, 0));
-    /* load the badge */
-    QImage badge (aSource);
-    Assert (!badge.isNull());
-    /* resize it and copy it onto the background. */
-    if (badge.width() < 32)
-        badge = badge.scaled (32, 32, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-    QPainter painter (&transImage);
-    painter.drawImage (QPoint ((transImage.width() - badge.width()) / 2.0,
-                               (transImage.height() - badge.height()) / 2.0),
-                       badge);
-    painter.end();
-    /* Convert it to a CGImage. */
-    return ::darwinToCGImageRef (&transImage);
-}
-
-/* Import private function to capture the window content of any given window. */
-CG_EXTERN_C_BEGIN
-typedef int CGSWindowID;
-typedef void *CGSConnectionID;
-CG_EXTERN CGSWindowID GetNativeWindowFromWindowRef(WindowRef ref);
-CG_EXTERN CGSConnectionID CGSMainConnectionID(void);
-CG_EXTERN void CGContextCopyWindowCaptureContentsToRect(CGContextRef c, CGRect dstRect, CGSConnectionID connection, CGSWindowID window, int zero);
-CG_EXTERN_C_END
-
-/**
- * Updates the dock preview image.
- *
- * This method is a callback that updates the 128x128 preview image of the VM window in the dock.
- *
- * @param   aVMImage   the vm screen as a CGImageRef
- * @param   aOverlayImage   an optional icon overlay image to add at the bottom right of the icon
- * @param   aStateImage   an optional state overlay image to add at the center of the icon
- */
-void darwinUpdateDockPreview (QWidget *aMainWindow, CGImageRef aVMImage, CGImageRef aOverlayImage, CGImageRef aStateImage /*= NULL*/)
-{
-    Assert (aVMImage);
-
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-    Assert (cs);
-
-    /* Calc the size of the dock icon image and fit it into 128x128 */
-    int targetWidth = 128;
-    int targetHeight = 128;
-    int scaledWidth;
-    int scaledHeight;
-    float aspect = static_cast <float> (CGImageGetWidth (aVMImage)) / CGImageGetHeight (aVMImage);
-    if (aspect > 1.0)
-    {
-        scaledWidth = targetWidth;
-        scaledHeight = targetHeight / aspect;
-    }
-    else
-    {
-        scaledWidth = targetWidth * aspect;
-        scaledHeight = targetHeight;
-    }
-    CGRect iconRect = CGRectMake ((targetWidth - scaledWidth) / 2.0,
-                                  (targetHeight - scaledHeight) / 2.0,
-                                  scaledWidth, scaledHeight);
-    /* Create the context to draw on */
-    CGContextRef context = BeginCGContextForApplicationDockTile();
-    Assert (context);
-    /* Clear the background */
-    CGContextSetBlendMode (context, kCGBlendModeNormal);
-    CGContextClearRect (context, CGRectMake (0, 0, 128, 128));
-    /* rounded corners */
-//        CGContextSetLineJoin (context, kCGLineJoinRound);
-//        CGContextSetShadow (context, CGSizeMake (10, 5), 1);
-//        CGContextSetAllowsAntialiasing (context, true);
-    /* some little boarder */
-    iconRect = CGRectInset (iconRect, 1, 1);
-    /* gray stroke */
-    CGContextSetRGBStrokeColor (context, 225.0/255.0, 218.0/255.0, 211.0/255.0, 1);
-    iconRect = CGRectInset (iconRect, 6, 6);
-    CGContextStrokeRectWithWidth (context, iconRect, 12);
-    iconRect = CGRectInset (iconRect, 5, 5);
-    /* black stroke */
-    CGContextSetRGBStrokeColor (context, 0.0, 0.0, 0.0, 1.0);
-    CGContextStrokeRectWithWidth (context, iconRect, 2);
-    /* vm content */
-    iconRect = CGRectInset (iconRect, 1, 1);
-    CGContextDrawImage (context, iconRect, aVMImage);
-    /* Process the content of any external OpenGL windows. */
-    WindowRef w = darwinToWindowRef (aMainWindow);
-    WindowGroupRef g = GetWindowGroup (w);
-    WindowGroupContentOptions wgco = kWindowGroupContentsReturnWindows | kWindowGroupContentsRecurse | kWindowGroupContentsVisible;
-    ItemCount c = CountWindowGroupContents (g, wgco);
-    float a1 = iconRect.size.width / static_cast <float> (CGImageGetWidth (aVMImage));
-    float a2 = iconRect.size.height / static_cast <float> (CGImageGetHeight (aVMImage));
-    HIViewRef mainView = HIViewGetRoot (w);
-    Rect tmpR;
-    GetWindowBounds (w, kWindowContentRgn, &tmpR);
-    HIRect mainRect = CGRectMake (tmpR.left, tmpR.top, tmpR.right-tmpR.left, tmpR.bottom-tmpR.top);
-    for (ItemCount i = 0; i <= c; ++i)
-    {
-        WindowRef wc;
-        OSStatus status = GetIndexedWindow (g, i, wgco, &wc);
-        if (status == noErr &&
-            wc != w)
-        {
-            WindowClass winClass;
-            status = GetWindowClass (wc, &winClass);
-            if (status == noErr &&
-                winClass == kOverlayWindowClass)
-            {
-                Rect tmpR1;
-                GetWindowBounds (wc, kWindowContentRgn, &tmpR1);
-                HIRect rect;
-                rect.size.width = (tmpR1.right-tmpR1.left) * a1;
-                rect.size.height = (tmpR1.bottom-tmpR1.top) * a2;
-                rect.origin.x = iconRect.origin.x + (tmpR1.left - mainRect.origin.x) * a1;
-                rect.origin.y = targetHeight - (iconRect.origin.y + (tmpR1.top - mainRect.origin.y) * a2) - rect.size.height;
-                /* This is a big, bad hack. The following functions aren't
-                 * documented nor official supported by apple. But its the only way
-                 * to capture the OpenGL content of a window without fiddling
-                 * around with gPixelRead or something like that. */
-                CGSWindowID wid = GetNativeWindowFromWindowRef(wc);
-                CGContextCopyWindowCaptureContentsToRect(context, rect, CGSMainConnectionID(), wid, 0);
-            }
-        }
-    }
-
-    /* the state image at center */
-    if (aStateImage)
-    {
-        CGRect stateRect = CGRectMake ((targetWidth - CGImageGetWidth (aStateImage)) / 2.0,
-                                       (targetHeight - CGImageGetHeight (aStateImage)) / 2.0,
-                                       CGImageGetWidth (aStateImage),
-                                       CGImageGetHeight (aStateImage));
-        CGContextDrawImage (context, stateRect, aStateImage);
-    }
-    /* the overlay image at bottom/right */
-    if (aOverlayImage)
-    {
-
-        CGRect overlayRect = CGRectMake (targetWidth - CGImageGetWidth (aOverlayImage),
-                                         0,
-                                         CGImageGetWidth (aOverlayImage),
-                                         CGImageGetHeight (aOverlayImage));
-        CGContextDrawImage (context, overlayRect, aOverlayImage);
-    }
-    /* This flush updates the dock icon */
-    CGContextFlush (context);
-    EndCGContextForApplicationDockTile (context);
-
-    CGColorSpaceRelease (cs);
-}
-
-/**
- * Updates the dock preview image.
- *
- * This method is a callback that updates the 128x128 preview image of the VM window in the dock.
- *
- * @param   aFrameBuffer    The guest frame buffer.
- * @param   aOverlayImage   an optional icon overlay image to add at the bottom right of the icon
- */
-void darwinUpdateDockPreview (QWidget *aMainWindow, VBoxFrameBuffer *aFrameBuffer, CGImageRef aOverlayImage, CGImageRef aStateImage /*= NULL*/)
-{
-    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-    Assert (cs);
-    /* Create the image copy of the framebuffer */
-    CGDataProviderRef dp = CGDataProviderCreateWithData (aFrameBuffer, aFrameBuffer->address(), aFrameBuffer->bitsPerPixel() / 8 * aFrameBuffer->width() * aFrameBuffer->height(), NULL);
-    Assert (dp);
-    CGImageRef ir = CGImageCreate (aFrameBuffer->width(), aFrameBuffer->height(), 8, 32, aFrameBuffer->bytesPerLine(), cs,
-                                   kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0, false,
-                                   kCGRenderingIntentDefault);
-    /* Update the dock preview icon */
-    ::darwinUpdateDockPreview (aMainWindow, ir, aOverlayImage, aStateImage);
-    /* Release the temp data and image */
-    CGDataProviderRelease (dp);
-    CGImageRelease (ir);
-    CGColorSpaceRelease (cs);
 }