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

Timestamp:

Mar 9, 2010 1:34:53 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58588

Message:

FE/Qt4: new core: dock icon preview with MM support added again

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBoxFBQuartz2D.cpp (modified) (1 diff)
• src/darwin/DockIconPreview.h (modified) (1 diff)
• src/darwin/UIAbstractDockIconPreview.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/darwin/AbstractDockIconPreview.cpp ) (4 diffs)
• src/darwin/UIAbstractDockIconPreview.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/darwin/AbstractDockIconPreview.h ) (2 diffs)
• src/darwin/UICocoaDockIconPreview.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/darwin/CocoaDockIconPreview.h ) (2 diffs)
• src/darwin/UICocoaDockIconPreview.mm (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/darwin/CocoaDockIconPreview.mm ) (15 diffs)
• src/globals/VBoxDefs.cpp (modified) (1 diff)
• src/globals/VBoxDefs.h (modified) (1 diff)
• src/globals/VBoxGlobal.cpp (modified) (2 diffs)
• src/runtime/UIMachine.h (modified) (1 diff)
• src/runtime/UIMachineLogic.cpp (modified) (10 diffs)
• src/runtime/UIMachineLogic.h (modified) (6 diffs)
• src/runtime/UIMachineView.cpp (modified) (16 diffs)
• src/runtime/UIMachineView.h (modified) (5 diffs)
• src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)
• src/runtime/normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• src/runtime/seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -522 +522 @@
         src/runtime/seamless/UIMachineWindowSeamless.cpp \
         src/runtime/seamless/UIMachineViewSeamless.cpp
+VirtualBox_SOURCES.darwin += \
+        src/darwin/UIAbstractDockIconPreview.cpp \
+        src/darwin/UICocoaDockIconPreview.mm
 endif
 
@@ -548 +551 @@
         src/win/VirtualBox.rc
 
-VirtualBox_SOURCES.darwin = \
+VirtualBox_SOURCES.darwin += \
         src/darwin/DarwinKeyboard.cpp \
         src/darwin/VBoxUtils-darwin.cpp \

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

@@ -230 +230 @@
 
     /* We handle the seamless mode as a special case. */
-    if (main->isTrueSeamless())
+    if (   main
+        && main->isTrueSeamless())
     {
         /* Here we paint the windows without any wallpaper.

trunk/src/VBox/Frontends/VirtualBox/src/darwin/DockIconPreview.h

@@ -35 +35 @@
 };
 
+#include "UICocoaDockIconPreview.h"
+class UIDockIconPreview: public UICocoaDockIconPreview
+{
+public:
+    UIDockIconPreview(UISession *pSession, const QPixmap& overlayImage)
+      : UICocoaDockIconPreview(pSession, overlayImage) {}
+};
+
 #else /* QT_MAC_USE_COCOA */
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.cpp

@@ -21 +21 @@
 
 /* VBox includes */
-#include "AbstractDockIconPreview.h"
-#include "VBoxConsoleWnd.h"
-#include "VBoxFrameBuffer.h"
+#include "UIAbstractDockIconPreview.h"
+#include "UISession.h"
+#include "UIFrameBuffer.h"
 
-AbstractDockIconPreview::AbstractDockIconPreview (VBoxConsoleWnd * /* aMainWnd */, const QPixmap& /* aOverlayImage */)
+UIAbstractDockIconPreview::UIAbstractDockIconPreview(UISession * /* pSession */, const QPixmap& /* overlayImage */)
 {
 }
 
-void AbstractDockIconPreview::updateDockPreview (VBoxFrameBuffer *aFrameBuffer)
+void UIAbstractDockIconPreview::updateDockPreview(UIFrameBuffer *pFrameBuffer)
 {
     CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
-    Assert (cs);
+    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);
-    Assert (ir);
+    CGDataProviderRef dp = CGDataProviderCreateWithData(pFrameBuffer, pFrameBuffer->address(), pFrameBuffer->bitsPerPixel() / 8 * pFrameBuffer->width() * pFrameBuffer->height(), NULL);
+    Assert(dp);
+    CGImageRef ir = CGImageCreate(pFrameBuffer->width(), pFrameBuffer->height(), 8, 32, pFrameBuffer->bytesPerLine(), cs,
+                                  kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0, false,
+                                  kCGRenderingIntentDefault);
+    Assert(ir);
 
     /* Update the dock preview icon */
-    updateDockPreview (ir);
+    updateDockPreview(ir);
 
     /* Release the temp data and image */
-    CGImageRelease (ir);
-    CGDataProviderRelease (dp);
-    CGColorSpaceRelease (cs);
+    CGImageRelease(ir);
+    CGDataProviderRelease(dp);
+    CGColorSpaceRelease(cs);
 }
 
-AbstractDockIconPreviewHelper::AbstractDockIconPreviewHelper (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage)
-    :  mMainWnd (aMainWnd)
-     , mDockIconRect (CGRectMake (0, 0, 128, 128))
-     , mDockMonitor (NULL)
-     , mDockMonitorGlossy (NULL)
-     , mUpdateRect (CGRectMake (0, 0, 0, 0))
-     , mMonitorRect (CGRectMake (0, 0, 0, 0))
+UIAbstractDockIconPreviewHelper::UIAbstractDockIconPreviewHelper(UISession *pSession, const QPixmap& overlayImage)
+    : m_pSession(pSession)
+    , m_dockIconRect(CGRectMake(0, 0, 128, 128))
+    , m_dockMonitor(NULL)
+    , m_dockMonitorGlossy(NULL)
+    , m_updateRect(CGRectMake(0, 0, 0, 0))
+    , m_monitorRect(CGRectMake(0, 0, 0, 0))
 {
-    mOverlayImage   = ::darwinToCGImageRef (&aOverlayImage);
-    Assert (mOverlayImage);
+    m_overlayImage   = ::darwinToCGImageRef(&overlayImage);
+    Assert(m_overlayImage);
 
-    mStatePaused    = ::darwinToCGImageRef ("state_paused_16px.png");
-    Assert (mStatePaused);
-    mStateSaving    = ::darwinToCGImageRef ("state_saving_16px.png");
-    Assert (mStateSaving);
-    mStateRestoring = ::darwinToCGImageRef ("state_restoring_16px.png");
-    Assert (mStateRestoring);
+    m_statePaused    = ::darwinToCGImageRef("state_paused_16px.png");
+    Assert(m_statePaused);
+    m_stateSaving    = ::darwinToCGImageRef("state_saving_16px.png");
+    Assert(m_stateSaving);
+    m_stateRestoring = ::darwinToCGImageRef("state_restoring_16px.png");
+    Assert(m_stateRestoring);
 }
 
-AbstractDockIconPreviewHelper::~AbstractDockIconPreviewHelper()
+UIAbstractDockIconPreviewHelper::~UIAbstractDockIconPreviewHelper()
 {
-    CGImageRelease (mOverlayImage);
-    if (mDockMonitor)
-        CGImageRelease (mDockMonitor);
-    if (mDockMonitorGlossy)
-        CGImageRelease (mDockMonitorGlossy);
+    CGImageRelease(m_overlayImage);
+    if (m_dockMonitor)
+        CGImageRelease(m_dockMonitor);
+    if (m_dockMonitorGlossy)
+        CGImageRelease(m_dockMonitorGlossy);
 
-    CGImageRelease (mStatePaused);
-    CGImageRelease (mStateSaving);
-    CGImageRelease (mStateRestoring);
+    CGImageRelease(m_statePaused);
+    CGImageRelease(m_stateSaving);
+    CGImageRelease(m_stateRestoring);
 }
 
-void AbstractDockIconPreviewHelper::initPreviewImages()
+void UIAbstractDockIconPreviewHelper::initPreviewImages()
 {
-    if (!mDockMonitor)
+    if (!m_dockMonitor)
     {
-        mDockMonitor = ::darwinToCGImageRef ("monitor.png");
-        Assert (mDockMonitor);
+        m_dockMonitor = ::darwinToCGImageRef("monitor.png");
+        Assert(m_dockMonitor);
         /* Center it on the dock icon context */
-        mMonitorRect = centerRect (CGRectMake (0, 0,
-                                               CGImageGetWidth (mDockMonitor),
-                                               CGImageGetWidth (mDockMonitor)));
+        m_monitorRect = centerRect(CGRectMake(0, 0,
+                                              CGImageGetWidth(m_dockMonitor),
+                                              CGImageGetWidth(m_dockMonitor)));
     }
 
-    if (!mDockMonitorGlossy)
+    if (!m_dockMonitorGlossy)
     {
-        mDockMonitorGlossy = ::darwinToCGImageRef ("monitor_glossy.png");
-        Assert (mDockMonitorGlossy);
+        m_dockMonitorGlossy = ::darwinToCGImageRef("monitor_glossy.png");
+        Assert(m_dockMonitorGlossy);
         /* This depends on the content of monitor.png */
-        mUpdateRect = CGRectMake (mMonitorRect.origin.x + 7 + 1,
-                                  mMonitorRect.origin.y + 8 + 1,
+        m_updateRect = CGRectMake(m_monitorRect.origin.x + 7 + 1,
+                                  m_monitorRect.origin.y + 8 + 1,
                                   118 - 7 - 2,
                                   103 - 8 - 2);
@@ -106 +106 @@
 }
 
-CGImageRef AbstractDockIconPreviewHelper::stateImage() const
+CGImageRef UIAbstractDockIconPreviewHelper::stateImage() const
 {
     CGImageRef img;
-    if (   mMainWnd->machineState() == KMachineState_Paused
-        || mMainWnd->machineState() == KMachineState_TeleportingPausedVM)
-        img = mStatePaused;
-    else if (   mMainWnd->machineState() == KMachineState_Restoring
-             || mMainWnd->machineState() == KMachineState_TeleportingIn)
-        img = mStateRestoring;
-    else if (   mMainWnd->machineState() == KMachineState_Saving
-             || mMainWnd->machineState() == KMachineState_LiveSnapshotting)
-        img = mStateSaving;
+    if (   m_pSession->machineState() == KMachineState_Paused
+        || m_pSession->machineState() == KMachineState_TeleportingPausedVM)
+        img = m_statePaused;
+    else if (   m_pSession->machineState() == KMachineState_Restoring
+             || m_pSession->machineState() == KMachineState_TeleportingIn)
+        img = m_stateRestoring;
+    else if (   m_pSession->machineState() == KMachineState_Saving
+             || m_pSession->machineState() == KMachineState_LiveSnapshotting)
+        img = m_stateSaving;
     else
         img = NULL;
@@ -123 +123 @@
 }
 
-void AbstractDockIconPreviewHelper::drawOverlayIcons (CGContextRef aContext)
+void UIAbstractDockIconPreviewHelper::drawOverlayIcons(CGContextRef context)
 {
-    CGRect overlayRect = CGRectMake (0, 0, 0, 0);
+    CGRect overlayRect = CGRectMake(0, 0, 0, 0);
     /* The overlay image at bottom/right */
-    if (mOverlayImage)
+    if (m_overlayImage)
     {
-        overlayRect = CGRectMake (mDockIconRect.size.width - CGImageGetWidth (mOverlayImage),
-                                  mDockIconRect.size.height - CGImageGetHeight (mOverlayImage),
-                                  CGImageGetWidth (mOverlayImage),
-                                  CGImageGetHeight (mOverlayImage));
-        CGContextDrawImage (aContext, flipRect (overlayRect), mOverlayImage);
+        overlayRect = CGRectMake(m_dockIconRect.size.width - CGImageGetWidth(m_overlayImage),
+                                 m_dockIconRect.size.height - CGImageGetHeight(m_overlayImage),
+                                 CGImageGetWidth(m_overlayImage),
+                                 CGImageGetHeight(m_overlayImage));
+        CGContextDrawImage(context, flipRect(overlayRect), m_overlayImage);
     }
     CGImageRef sImage = stateImage();
@@ -139 +139 @@
     if (sImage)
     {
-        CGRect stateRect = CGRectMake (overlayRect.origin.x - CGImageGetWidth (sImage) / 2.0,
-                                       overlayRect.origin.y - CGImageGetHeight (sImage) / 2.0,
-                                       CGImageGetWidth (sImage),
-                                       CGImageGetHeight (sImage));
-        CGContextDrawImage (aContext, flipRect (stateRect), sImage);
+        CGRect stateRect = CGRectMake(overlayRect.origin.x - CGImageGetWidth(sImage) / 2.0,
+                                      overlayRect.origin.y - CGImageGetHeight(sImage) / 2.0,
+                                      CGImageGetWidth(sImage),
+                                      CGImageGetHeight(sImage));
+        CGContextDrawImage(context, flipRect(stateRect), sImage);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIAbstractDockIconPreview.h

@@ -22 +22 @@
  */
 
-#ifndef ___AbstractVBoxDockIconPreview_h___
-#define ___AbstractVBoxDockIconPreview_h___
+#ifndef ___UIAbstractDockIconPreview_h___
+#define ___UIAbstractDockIconPreview_h___
 
 /* System includes */
@@ -31 +31 @@
 #include "VBoxUtils-darwin.h"
 
-class VBoxConsoleWnd;
-class VBoxFrameBuffer;
+class UISession;
+class UIFrameBuffer;
 
 class QPixmap;
 
-class AbstractDockIconPreview
+class UIAbstractDockIconPreview
 {
 public:
-    AbstractDockIconPreview (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage);
-    virtual ~AbstractDockIconPreview() {};
+    UIAbstractDockIconPreview(UISession *pSession, const QPixmap& overlayImage);
+    virtual ~UIAbstractDockIconPreview() {};
 
     virtual void updateDockOverlay() = 0;
-    virtual void updateDockPreview (CGImageRef aVMImage) = 0;
-    virtual void updateDockPreview (VBoxFrameBuffer *aFrameBuffer);
+    virtual void updateDockPreview(CGImageRef VMImage) = 0;
+    virtual void updateDockPreview(UIFrameBuffer *pFrameBuffer);
 
-    virtual void setOriginalSize (int /* aWidth */, int /* aHeight */) {}
+    virtual void setOriginalSize(int /* aWidth */, int /* aHeight */) {}
 };
 
-class AbstractDockIconPreviewHelper
+class UIAbstractDockIconPreviewHelper
 {
 public:
-    AbstractDockIconPreviewHelper (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage);
-    virtual ~AbstractDockIconPreviewHelper();
+    UIAbstractDockIconPreviewHelper(UISession *pSession, const QPixmap& overlayImage);
+    virtual ~UIAbstractDockIconPreviewHelper();
     void initPreviewImages();
     inline CGImageRef stateImage() const;
-    void drawOverlayIcons (CGContextRef aContext);
+    void drawOverlayIcons(CGContextRef context);
 
     /* Flipping is necessary cause the drawing context in Carbon is flipped by 180 degree */
-    inline CGRect flipRect (CGRect aRect) const { return ::darwinFlipCGRect (aRect, mDockIconRect); }
-    inline CGRect centerRect (CGRect aRect) const { return ::darwinCenterRectTo (aRect, mDockIconRect); }
-    inline CGRect centerRectTo (CGRect aRect, const CGRect& aToRect) const { return ::darwinCenterRectTo (aRect, aToRect); }
+    inline CGRect flipRect(CGRect rect) const { return ::darwinFlipCGRect(rect, m_dockIconRect); }
+    inline CGRect centerRect(CGRect rect) const { return ::darwinCenterRectTo(rect, m_dockIconRect); }
+    inline CGRect centerRectTo(CGRect rect, const CGRect& toRect) const { return ::darwinCenterRectTo(rect, toRect); }
 
     /* Private member vars */
-    VBoxConsoleWnd *mMainWnd;
-    const CGRect mDockIconRect;
+    UISession *m_pSession;
+    const CGRect m_dockIconRect;
 
-    CGImageRef mOverlayImage;
-    CGImageRef mDockMonitor;
-    CGImageRef mDockMonitorGlossy;
+    CGImageRef m_overlayImage;
+    CGImageRef m_dockMonitor;
+    CGImageRef m_dockMonitorGlossy;
 
-    CGImageRef mStatePaused;
-    CGImageRef mStateSaving;
-    CGImageRef mStateRestoring;
+    CGImageRef m_statePaused;
+    CGImageRef m_stateSaving;
+    CGImageRef m_stateRestoring;
 
-    CGRect mUpdateRect;
-    CGRect mMonitorRect;
+    CGRect m_updateRect;
+    CGRect m_monitorRect;
 };
 
-#endif /* ___AbstractVBoxDockIconPreview_h___ */
+#endif /* ___UIAbstractDockIconPreview_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UICocoaDockIconPreview.h

@@ -3 +3 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * CocoaDockIconPreview class declaration
+ * UICocoaDockIconPreview class declaration
  */
 
@@ -22 +22 @@
  */
 
-#ifndef ___CocoaDockIconPreview_h___
-#define ___CocoaDockIconPreview_h___
+#ifndef ___UICocoaDockIconPreview_h___
+#define ___UICocoaDockIconPreview_h___
 
 /* Qt includes */
-#include "AbstractDockIconPreview.h"
+#include "UIAbstractDockIconPreview.h"
 
-class CocoaDockIconPreviewPrivate;
+class UICocoaDockIconPreviewPrivate;
 
-class CocoaDockIconPreview: public AbstractDockIconPreview
+class UICocoaDockIconPreview: public UIAbstractDockIconPreview
 {
 public:
-    CocoaDockIconPreview (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage);
-    ~CocoaDockIconPreview();
+    UICocoaDockIconPreview(UISession *pSession, const QPixmap& overlayImage);
+    ~UICocoaDockIconPreview();
 
     virtual void updateDockOverlay();
-    virtual void updateDockPreview (CGImageRef aVMImage);
-    virtual void updateDockPreview (VBoxFrameBuffer *aFrameBuffer);
+    virtual void updateDockPreview(CGImageRef VMImage);
+    virtual void updateDockPreview(UIFrameBuffer *pFrameBuffer);
 
-    virtual void setOriginalSize (int aWidth, int aHeight);
+    virtual void setOriginalSize(int aWidth, int aHeight);
 
 private:
-    CocoaDockIconPreviewPrivate *d;
+    UICocoaDockIconPreviewPrivate *d;
 };
 
-#endif /* ___CocoaDockIconPreview_h___ */
+#endif /* ___UICocoaDockIconPreview_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/darwin/UICocoaDockIconPreview.mm

@@ -23 +23 @@
 
 /* VBox includes */
-#include "CocoaDockIconPreview.h"
+#include "UICocoaDockIconPreview.h"
 #include "VBoxCocoaHelper.h"
 
@@ -29 +29 @@
 #import <Cocoa/Cocoa.h>
 
-@interface DockTileMonitor: NSView
-{
-    CocoaDockIconPreviewPrivate *p;
+@interface UIDockTileMonitor: NSView
+{
+    UICocoaDockIconPreviewPrivate *p;
 
     NSImageView *mScreenContent;
     NSImageView *mMonitorGlossy;
 }
-- (id)initWithFrame:(NSRect)frame parent:(CocoaDockIconPreviewPrivate*)parent;
+- (id)initWithFrame:(NSRect)frame parent:(UICocoaDockIconPreviewPrivate*)parent;
 - (NSImageView*)screenContent;
 - (void)resize:(NSSize)size;
 @end
 
-@interface DockTileOverlay: NSView
-{
-    CocoaDockIconPreviewPrivate *p;
-}
-- (id)initWithFrame:(NSRect)frame parent:(CocoaDockIconPreviewPrivate*)parent;
-@end
-
-@interface DockTile: NSView
-{
-    CocoaDockIconPreviewPrivate *p;
-
-    DockTileMonitor *mMonitor;
+@interface UIDockTileOverlay: NSView
+{
+    UICocoaDockIconPreviewPrivate *p;
+}
+- (id)initWithFrame:(NSRect)frame parent:(UICocoaDockIconPreviewPrivate*)parent;
+@end
+
+@interface UIDockTile: NSView
+{
+    UICocoaDockIconPreviewPrivate *p;
+
+    UIDockTileMonitor *mMonitor;
     NSImageView     *mAppIcon;
 
-    DockTileOverlay *mOverlay;
-}
-- (id)initWithParent:(CocoaDockIconPreviewPrivate*)parent;
+    UIDockTileOverlay *mOverlay;
+}
+- (id)initWithParent:(UICocoaDockIconPreviewPrivate*)parent;
 - (NSView*)screenContent;
 - (void)cleanup;
@@ -71 +71 @@
  * from any Cocoa class.
  */
-class CocoaDockIconPreviewPrivate: public AbstractDockIconPreviewHelper
+class UICocoaDockIconPreviewPrivate: public UIAbstractDockIconPreviewHelper
 {
 public:
-    inline CocoaDockIconPreviewPrivate (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage)
-      :AbstractDockIconPreviewHelper (aMainWnd, aOverlayImage) 
-    {
-        mDockTile = [[DockTile alloc] initWithParent:this];
-    }
-
-    inline ~CocoaDockIconPreviewPrivate()
-    {
-        [mDockTile release];
+    inline UICocoaDockIconPreviewPrivate(UISession *pSession, const QPixmap& overlayImage)
+      :UIAbstractDockIconPreviewHelper(pSession, overlayImage) 
+    {
+        mUIDockTile = [[UIDockTile alloc] initWithParent:this];
+    }
+
+    inline ~UICocoaDockIconPreviewPrivate()
+    {
+        [mUIDockTile release];
     }
       
-    DockTile *mDockTile;
+    UIDockTile *mUIDockTile;
 };
 
@@ -91 +91 @@
  * Cocoa wrapper for the abstract dock icon preview class 
  */
-CocoaDockIconPreview::CocoaDockIconPreview (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage)
-  : AbstractDockIconPreview (aMainWnd, aOverlayImage)
-{
-    CocoaAutoreleasePool pool;
-
-    d = new CocoaDockIconPreviewPrivate (aMainWnd, aOverlayImage);
-}
-
-CocoaDockIconPreview::~CocoaDockIconPreview()
+UICocoaDockIconPreview::UICocoaDockIconPreview(UISession *pSession, const QPixmap& overlayImage)
+  : UIAbstractDockIconPreview(pSession, overlayImage)
+{
+    CocoaAutoreleasePool pool;
+
+    d = new UICocoaDockIconPreviewPrivate(pSession, overlayImage);
+}
+
+UICocoaDockIconPreview::~UICocoaDockIconPreview()
 {
     CocoaAutoreleasePool pool;
@@ -106 +106 @@
 }
 
-void CocoaDockIconPreview::updateDockOverlay()
-{
-    CocoaAutoreleasePool pool;
-
-    [d->mDockTile updateAppIcon];
-}
-
-void CocoaDockIconPreview::updateDockPreview (CGImageRef aVMImage)
-{
-    CocoaAutoreleasePool pool;
-
-    [d->mDockTile updateMonitorWithImage:aVMImage];
-}
-
-void CocoaDockIconPreview::updateDockPreview (VBoxFrameBuffer *aFrameBuffer)
-{
-    CocoaAutoreleasePool pool;
-
-    AbstractDockIconPreview::updateDockPreview (aFrameBuffer);
-}
-
-
-void CocoaDockIconPreview::setOriginalSize (int aWidth, int aHeight)
-{
-    CocoaAutoreleasePool pool;
-
-    [d->mDockTile resizeMonitor:NSMakeSize (aWidth, aHeight)];
+void UICocoaDockIconPreview::updateDockOverlay()
+{
+    CocoaAutoreleasePool pool;
+
+    [d->mUIDockTile updateAppIcon];
+}
+
+void UICocoaDockIconPreview::updateDockPreview(CGImageRef VMImage)
+{
+    CocoaAutoreleasePool pool;
+
+    [d->mUIDockTile updateMonitorWithImage:VMImage];
+}
+
+void UICocoaDockIconPreview::updateDockPreview(UIFrameBuffer *pFrameBuffer)
+{
+    CocoaAutoreleasePool pool;
+
+    UIAbstractDockIconPreview::updateDockPreview(pFrameBuffer);
+}
+
+void UICocoaDockIconPreview::setOriginalSize(int width, int height)
+{
+    CocoaAutoreleasePool pool;
+
+    [d->mUIDockTile resizeMonitor:NSMakeSize(width, height)];
 }
 
@@ -138 +137 @@
  * Class for arranging/updating the layers for the glossy monitor preview.
  */
-@implementation DockTileMonitor;
-- (id)initWithFrame:(NSRect)frame parent:(CocoaDockIconPreviewPrivate*)parent
+@implementation UIDockTileMonitor;
+- (id)initWithFrame:(NSRect)frame parent:(UICocoaDockIconPreviewPrivate*)parent
 {
     self = [super initWithFrame:frame];
@@ -147 +146 @@
         p = parent;
         /* The screen content view */
-        mScreenContent = [[NSImageView alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->mUpdateRect))];
+        mScreenContent = [[NSImageView alloc] initWithFrame:NSRectFromCGRect(p->flipRect(p->m_updateRect))];
 //        [mScreenContent setImageAlignment: NSImageAlignCenter];
         [mScreenContent setImageAlignment: NSImageAlignTop| NSImageAlignLeft];
@@ -153 +152 @@
         [self addSubview: mScreenContent];
         /* The state view */
-        mMonitorGlossy = [[NSImageView alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->mMonitorRect))];
-        [mMonitorGlossy setImage: darwinCGImageToNSImage (p->mDockMonitorGlossy)];
+        mMonitorGlossy = [[NSImageView alloc] initWithFrame:NSRectFromCGRect(p->flipRect(p->m_monitorRect))];
+        [mMonitorGlossy setImage: darwinCGImageToNSImage (p->m_dockMonitorGlossy)];
         [self addSubview: mMonitorGlossy];
     }
@@ -163 +162 @@
 - (void)drawRect:(NSRect)aRect;
 {
-    NSImage *dockMonitor = darwinCGImageToNSImage (p->mDockMonitor);
-    [dockMonitor drawInRect:NSRectFromCGRect (p->flipRect (p->mMonitorRect)) fromRect:aRect operation:NSCompositeSourceOver fraction:1.0];
+    NSImage *dockMonitor = darwinCGImageToNSImage(p->m_dockMonitor);
+    [dockMonitor drawInRect:NSRectFromCGRect(p->flipRect(p->m_monitorRect)) fromRect:aRect operation:NSCompositeSourceOver fraction:1.0];
     [dockMonitor release];
 }
@@ -180 +179 @@
     if (size.width > size.height)
     {
-        w = p->mUpdateRect.size.width;
-        h = ((float)size.height / size.width * p->mUpdateRect.size.height);
+        w = p->m_updateRect.size.width;
+        h = ((float)size.height / size.width * p->m_updateRect.size.height);
     }
     else
     {
-        w = ((float)size.width / size.height * p->mUpdateRect.size.width);
-        h = p->mUpdateRect.size.height;
-    }
-    CGRect r = (p->flipRect (p->centerRectTo (CGRectMake (0, 0, (int)w, (int)h), p->mUpdateRect)));
+        w = ((float)size.width / size.height * p->m_updateRect.size.width);
+        h = p->m_updateRect.size.height;
+    }
+    CGRect r = (p->flipRect (p->centerRectTo (CGRectMake (0, 0, (int)w, (int)h), p->m_updateRect)));
     r.origin.x = (int)r.origin.x;
     r.origin.y = (int)r.origin.y;
@@ -203 +202 @@
  * in the application icon & preview mode.
  */
-@implementation DockTileOverlay
-- (id)initWithFrame:(NSRect)frame parent:(CocoaDockIconPreviewPrivate*)parent
+@implementation UIDockTileOverlay
+- (id)initWithFrame:(NSRect)frame parent:(UICocoaDockIconPreviewPrivate*)parent
 {
     self = [super initWithFrame:frame];
@@ -226 +225 @@
  * and preview mode & forwards all update request to the appropriate methods.
  */
-@implementation DockTile
-- (id)initWithParent:(CocoaDockIconPreviewPrivate*)parent
+@implementation UIDockTile
+- (id)initWithParent:(UICocoaDockIconPreviewPrivate*)parent
 {
     self = [super init];
@@ -240 +239 @@
         [self restoreAppIcon];
         /* The overlay */
-        mOverlay = [[DockTileOverlay alloc] initWithFrame:NSRectFromCGRect(p->flipRect (p->mDockIconRect)) parent:p];
+        mOverlay = [[UIDockTileOverlay alloc] initWithFrame:NSRectFromCGRect(p->flipRect (p->m_dockIconRect)) parent:p];
         [self addSubview: mOverlay];
     }
@@ -273 +272 @@
     {
         [self cleanup];
-        mAppIcon = [[NSImageView alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->mDockIconRect))];
+        mAppIcon = [[NSImageView alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->m_dockIconRect))];
         [mAppIcon setImage: [NSImage imageNamed:@"NSApplicationIcon"]];
         [self addSubview: mAppIcon positioned:NSWindowBelow relativeTo:mOverlay];
@@ -291 +290 @@
         p->initPreviewImages();
         [self cleanup];
-        mMonitor = [[DockTileMonitor alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->mDockIconRect)) parent:p];
+        mMonitor = [[UIDockTileMonitor alloc] initWithFrame:NSRectFromCGRect (p->flipRect (p->m_dockIconRect)) parent:p];
         [self addSubview: mMonitor positioned:NSWindowBelow relativeTo:mOverlay];
     }

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

@@ -56 +56 @@
 #ifdef Q_WS_MAC
 const char* VBoxDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
+const char* VBoxDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
 const char* VBoxDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
 #endif /* Q_WS_MAC */

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

@@ -174 +174 @@
 #ifdef Q_WS_MAC
     static const char* GUI_RealtimeDockIconUpdateEnabled;
+    static const char* GUI_RealtimeDockIconUpdateMonitor;
     static const char* GUI_PresentationModeEnabled;
 #endif /* Q_WS_MAC */

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

@@ -35 +35 @@
 
 #ifdef VBOX_WITH_NEW_RUNTIME_CORE
-#include "UIMachine.h"
+# include "UIMachine.h"
+# include "UISession.h"
 #endif
 #ifdef VBOX_WITH_REGISTRATION
-#include "UIRegistrationWzd.h"
+# include "UIRegistrationWzd.h"
 #endif
 #include "VBoxUpdateDlg.h"
@@ -395 +396 @@
         else if (mGlobal.isVMConsoleProcess())
         {
-#ifndef VBOX_WITH_NEW_RUNTIME_CORE
-            /* TODO_NEW_CORE */
             /* Check for the currently running machine */
-            CMachine machine = mGlobal.consoleWnd().session().GetMachine();
-            if (QString::fromUtf16(id) == machine.GetId())
+            if (QString::fromUtf16(id) == mGlobal.vmUuid)
             {
                 QString strKey = QString::fromUtf16(key);
                 QString strVal = QString::fromUtf16(value);
-                if (strKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled)
+                // TODO_NEW_CORE: we should cleanup
+                // VBoxChangeDockIconUpdateEvent to have no parameters. So it
+                // could really be use for both events and the consumer should
+                // ask per GetExtraData how the current values are.
+                if (   strKey == VBoxDefs::GUI_RealtimeDockIconUpdateEnabled
+                    || strKey == VBoxDefs::GUI_RealtimeDockIconUpdateMonitor)
                 {
                     /* Default to true if it is an empty value */
-                    QString strTest = strVal.toLower();
-                    bool f = (strTest.isEmpty() || strTest == "true");
+                    bool f = strVal.toLower() == "false" ? false : true;
                     QApplication::postEvent(&mGlobal, new VBoxChangeDockIconUpdateEvent(f));
                 }
             }
-#endif /* VBOX_WITH_NEW_RUNTIME_CORE */
         }
 #endif /* Q_WS_MAC */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -52 +52 @@
     /* Public getters: */
     QWidget* mainWindow() const;
+    UISession *uisession() const { return m_pSession; }
 
 private slots:

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

@@ -38 +38 @@
 #include "VBoxVMSettingsSF.h"
 #include "UIFirstRunWzd.h"
+#ifdef Q_WS_MAC
+# include "DockIconPreview.h"
+#endif /* Q_WS_MAC */
 
 //#include "VBoxDownloaderWgt.h"
@@ -58 +61 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
 # include <iprt/ldr.h>
-#endif
+#endif /* VBOX_WITH_DEBUGGER_GUI */
 
 #ifdef Q_WS_X11
 # include <XKeyboard.h>
-#endif
-
-#ifdef Q_WS_X11
 # include <QX11Info>
-#endif
+#endif /* Q_WS_X11 */
 
 struct MediumTarget
@@ -396 +396 @@
 }
 
+#ifdef Q_WS_MAC
+void UIMachineLogic::updateDockIcon()
+{
+    if (!isMachineWindowsCreated())
+        return;
+
+    if (   m_fIsDockIconEnabled
+        && m_pDockIconPreview)
+        if(UIMachineView *pView = machineWindows().at(m_DockIconPreviewMonitor)->machineView())
+            if (CGImageRef image = pView->vmContentImage())
+            {
+                m_pDockIconPreview->updateDockPreview(image);
+                CGImageRelease(image);
+            }
+}
+#endif /* Q_WS_MAC */
+
 UIMachineLogic::UIMachineLogic(QObject *pParent,
                                UISession *pSession,
                                UIActionsPool *pActionsPool,
                                UIVisualStateType visualStateType)
-    : QObject(pParent)
+    : QIWithRetranslateUI3<QObject>(pParent)
     , m_pSession(pSession)
     , m_pActionsPool(pActionsPool)
@@ -409 +426 @@
     , m_fIsPreventAutoStart(false)
     , m_fIsPreventAutoClose(false)
+#ifdef Q_WS_MAC
+    , m_fIsDockIconEnabled(true)
+    , m_pDockIconPreview(0)
+    , m_pDockPreviewSelectMonitorGroup(0)
+    , m_DockIconPreviewMonitor(0)
+#endif /* Q_WS_MAC */
 {
 }
@@ -418 +441 @@
     //dbgDestroy();
 #endif
+
+#ifdef Q_WS_MAC
+    if (m_pDockIconPreview)
+        delete m_pDockIconPreview;
+#endif /* Q_WS_MAC */
 }
 
@@ -429 +457 @@
     m_machineWindowsList << pMachineWindow;
 }
+
+void UIMachineLogic::retranslateUi()
+{
+#ifdef Q_WS_MAC
+    if (m_pDockPreviewSelectMonitorGroup)
+    {
+        const QList<QAction*> &actions = m_pDockPreviewSelectMonitorGroup->actions();
+        for (int i = 0; i < actions.size(); ++i)
+        {
+            QAction *pAction = actions.at(i);
+            pAction->setText(tr("Preview Monitor %1").arg(pAction->data().toInt() + 1));
+        }
+    }
+#endif /* Q_WS_MAC */
+}
+
+#ifdef Q_WS_MAC
+void UIMachineLogic::updateDockOverlay()
+{
+    /* Only to an update to the realtime preview if this is enabled by the user
+     * & we are in an state where the framebuffer is likely valid. Otherwise to
+     * the overlay stuff only. */
+    KMachineState state = uisession()->machineState();
+    if (m_fIsDockIconEnabled &&
+        (state == KMachineState_Running ||
+         state == KMachineState_Paused ||
+         state == KMachineState_Teleporting ||
+         state == KMachineState_LiveSnapshotting ||
+         state == KMachineState_Restoring ||
+         state == KMachineState_TeleportingPausedVM ||
+         state == KMachineState_TeleportingIn ||
+         state == KMachineState_Saving))
+        updateDockIcon();
+    else if (m_pDockIconPreview)
+        m_pDockIconPreview->updateDockOverlay();
+}
+#endif /* Q_WS_MAC */
 
 void UIMachineLogic::prepareConsoleConnections()
@@ -578 +643 @@
     QMenu *pDockSettingsMenu = actionsPool()->action(UIActionIndex_Menu_DockSettings)->menu();
     QActionGroup *pDockPreviewModeGroup = new QActionGroup(this);
+    QAction *pDockDisablePreview = actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor);
+    pDockPreviewModeGroup->addAction(pDockDisablePreview);
     QAction *pDockEnablePreviewMonitor = actionsPool()->action(UIActionIndex_Toggle_DockPreviewMonitor);
     pDockPreviewModeGroup->addAction(pDockEnablePreviewMonitor);
-    QAction *pDockDisablePreview = actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor);
-    pDockPreviewModeGroup->addAction(pDockDisablePreview);
     pDockSettingsMenu->addActions(pDockPreviewModeGroup->actions());
-
-    pDockMenu->addMenu(pDockSettingsMenu);
 
     connect(pDockPreviewModeGroup, SIGNAL(triggered(QAction*)),
             this, SLOT(sltDockPreviewModeChanged(QAction*)));
+    connect(&vboxGlobal(), SIGNAL(dockIconUpdateChanged(const VBoxChangeDockIconUpdateEvent &)),
+            this, SLOT(sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &)));
+
+    /* Monitor selection if there are more than one monitor */
+    int cGuestScreens = uisession()->session().GetMachine().GetMonitorCount();
+    if (cGuestScreens > 1)
+    {
+        pDockSettingsMenu->addSeparator();
+        m_DockIconPreviewMonitor = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt();
+        m_pDockPreviewSelectMonitorGroup = new QActionGroup(this);
+        for (int i = 0; i < cGuestScreens; ++i)
+        {
+            QAction *pAction = new QAction(m_pDockPreviewSelectMonitorGroup);
+            pAction->setCheckable(true);
+            pAction->setData(i);
+            if (m_DockIconPreviewMonitor == i)
+                pAction->setChecked(true);
+        }
+        pDockSettingsMenu->addActions(m_pDockPreviewSelectMonitorGroup->actions());
+        connect(m_pDockPreviewSelectMonitorGroup, SIGNAL(triggered(QAction*)),
+                this, SLOT(sltDockPreviewMonitorChanged(QAction*)));
+    }
+
+    pDockMenu->addMenu(pDockSettingsMenu);
 
     /* Add it to the dock. */
     extern void qt_mac_set_dock_menu(QMenu *);
     qt_mac_set_dock_menu(pDockMenu);
+
+    /* Now the dock icon preview */
+    QString osTypeId = session().GetConsole().GetGuest().GetOSTypeId();
+    m_pDockIconPreview = new UIDockIconPreview(m_pSession, vboxGlobal().vmGuestOSTypeIcon(osTypeId));
+
+    QString strTest = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
+    /* Default to true if it is an empty value */
+    bool f = (strTest.isEmpty() || strTest == "true");
+    if (f)
+        pDockEnablePreviewMonitor->setChecked(true);
+    else
+        pDockDisablePreview->setChecked(true);
+
+    /* Default to true if it is an empty value */
+    setDockIconPreviewEnabled(f);
+    updateDockOverlay();
 }
 #endif /* Q_WS_MAC */
@@ -741 +844 @@
             break;
     }
+
+#ifdef Q_WS_MAC
+    /* Update Dock Overlay: */
+    updateDockOverlay();
+#endif /* Q_WS_MAC */
 }
 
@@ -1434 +1542 @@
 void UIMachineLogic::sltDockPreviewModeChanged(QAction *pAction)
 {
-//    if (mConsole)
-    {
-        CMachine machine = m_pSession->session().GetMachine();
-        if (!machine.isNull())
-        {
-            if (pAction == actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor))
-                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "false");
-            else if (pAction == actionsPool()->action(UIActionIndex_Toggle_DockPreviewMonitor))
-                machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "true");
-//            mConsole->updateDockOverlay();
-        }
+    CMachine machine = m_pSession->session().GetMachine();
+    if (!machine.isNull())
+    {
+        bool fEnabled = true;
+        if (pAction == actionsPool()->action(UIActionIndex_Toggle_DockDisableMonitor))
+            fEnabled = false;
+
+        machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, fEnabled ? "true" : "false");
+        updateDockOverlay();
+    }
+}
+
+void UIMachineLogic::sltDockPreviewMonitorChanged(QAction *pAction)
+{
+    CMachine machine = m_pSession->session().GetMachine();
+    if (!machine.isNull())
+    {
+        int monitor = pAction->data().toInt();
+        machine.SetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor, QString::number(monitor));
+        updateDockOverlay();
+    }
+}
+
+void UIMachineLogic::sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &event)
+{
+    if (isMachineWindowsCreated())
+    {
+        setDockIconPreviewEnabled(event.mChanged);
+        m_pDockPreviewSelectMonitorGroup->setEnabled(event.mChanged);
+        m_DockIconPreviewMonitor = session().GetMachine().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateMonitor).toInt();
+        updateDockOverlay();
     }
 }
@@ -1612 +1740 @@
 
 #if 0 // TODO: Where to move that?
-# ifdef Q_WS_MAC
-void UIMachineLogic::fadeToBlack()
-{
-    /* Fade to black */
-    CGAcquireDisplayFadeReservation (kCGMaxDisplayReservationInterval, &mFadeToken);
-    CGDisplayFade (mFadeToken, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, true);
-}
-void UIMachineLogic::fadeToNormal()
-{
-    /* Fade back to the normal gamma */
-    CGDisplayFade (mFadeToken, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, false);
-    CGReleaseDisplayFadeReservation (mFadeToken);
-    mConsole->setMouseCoalescingEnabled (true);
-}
-# endif
-bool UIMachineLogic::toggleFullscreenMode (bool fOn, bool fSeamless)
-{
-    /* Please note: For some platforms like the Mac, the calling order of the
-     * functions in this methods is vital. So please be careful on changing
-     * this. */
-
-    QSize initialSize = size();
-    if (fSeamless || mConsole->isAutoresizeGuestActive())
-    {
-        QRect screen = fSeamless ?
-            QApplication::desktop()->availableGeometry (this) :
-            QApplication::desktop()->screenGeometry (this);
-        ULONG64 availBits = mSession.GetMachine().GetVRAMSize() /* vram */
-                          * _1M /* mb to bytes */
-                          * 8; /* to bits */
-        ULONG guestBpp = mConsole->console().GetDisplay().GetBitsPerPixel();
-        ULONG64 usedBits = (screen.width() /* display width */
-                         * screen.height() /* display height */
-                         * guestBpp
-                         + _1M * 8) /* current cache per screen - may be changed in future */
-                         * mSession.GetMachine().GetMonitorCount() /**< @todo fix assumption that all screens have same resolution */
-                         + 4096 * 8; /* adapter info */
-        if (fOn && (availBits < usedBits))
-        {
-            if (fSeamless)
-            {
-                vboxProblem().cannotEnterSeamlessMode (
-                    screen.width(), screen.height(), guestBpp,
-                    (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
-                return false;
-            }
-            else
-            {
-                int result = vboxProblem().cannotEnterFullscreenMode (
-                    screen.width(), screen.height(), guestBpp,
-                    (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
-                if (result == QIMessageBox::Cancel)
-                    return false;
-            }
-        }
-    }
-
-    AssertReturn (mConsole, false);
-    AssertReturn ((mHiddenChildren.empty() == fOn), false);
-    AssertReturn ((fSeamless && mIsSeamless != fOn) ||
-                  (!fSeamless && mIsFullscreen != fOn), false);
-    if (fOn)
-        AssertReturn ((fSeamless && !mIsFullscreen) ||
-                      (!fSeamless && !mIsSeamless), false);
-
-    if (fOn)
-    {
-        /* Take the toggle hot key from the menu item. Since
-         * VBoxGlobal::extractKeyFromActionText gets exactly the
-         * linked key without the 'Host+' part we are adding it here. */
-        QString hotKey = QString ("Host+%1")
-            .arg (VBoxGlobal::extractKeyFromActionText (fSeamless ?
-                  mVmSeamlessAction->text() : mVmFullscreenAction->text()));
-
-        Assert (!hotKey.isEmpty());
-
-        /* Show the info message. */
-        bool ok = fSeamless ?
-            vboxProblem().confirmGoingSeamless (hotKey) :
-            vboxProblem().confirmGoingFullscreen (hotKey);
-        if (!ok)
-            return false;
-    }
-
-#ifdef Q_WS_MAC
-    if (!fSeamless)
-    {
-    }
-#endif
-
-    if (fSeamless)
-    {
-        /* Activate the auto-resize feature required for the seamless mode. */
-        if (!mVmAutoresizeGuestAction->isChecked())
-            mVmAutoresizeGuestAction->setChecked (true);
-
-        /* Activate the mouse integration feature for the seamless mode. */
-        if (mVmDisableMouseIntegrAction->isChecked())
-            mVmDisableMouseIntegrAction->setChecked (false);
-
-        mVmAdjustWindowAction->setEnabled (!fOn);
-        mVmFullscreenAction->setEnabled (!fOn);
-        mVmAutoresizeGuestAction->setEnabled (!fOn);
-        mVmDisableMouseIntegrAction->setEnabled (!fOn);
-
-        mConsole->console().GetDisplay().SetSeamlessMode (fOn);
-        mIsSeamless = fOn;
-    }
-    else
-    {
-        mIsFullscreen = fOn;
-        mVmAdjustWindowAction->setEnabled (!fOn);
-        mVmSeamlessAction->setEnabled (!fOn && m_fIsGuestSupportsSeamless && m_fIsGuestSupportsGraphics);
-    }
-
-    bool wasHidden = isHidden();
-
-    /* Temporarily disable the mode-related action to make sure
-     * user can not leave the mode before he enter it and inside out. */
-    fSeamless ? mVmSeamlessAction->setEnabled (false) :
-                mVmFullscreenAction->setEnabled (false);
-
-    /* Calculate initial console size */
-    QSize consoleSize;
-
-    if (fOn)
-    {
-        consoleSize = mConsole->frameSize();
-        consoleSize -= QSize (mConsole->frameWidth() * 2, mConsole->frameWidth() * 2);
-
-        /* Toggle console to manual resize mode. */
-        mConsole->setIgnoreMainwndResize (true);
-
-        /* Memorize the maximized state. */
-        QDesktopWidget *dtw = QApplication::desktop();
-        mWasMax = isWindowMaximized() &&
-                  dtw->availableGeometry().width()  == frameSize().width() &&
-                  dtw->availableGeometry().height() == frameSize().height();
-
-        /* Save the previous scroll-view minimum size before entering
-         * fullscreen/seamless state to restore this minimum size before
-         * the exiting fullscreen. Required for correct scroll-view and
-         * guest display update in SDL mode. */
-        mPrevMinSize = mConsole->minimumSize();
-        mConsole->setMinimumSize (0, 0);
-
-        /* let the widget take the whole available desktop space */
-        QRect scrGeo = fSeamless ?
-            dtw->availableGeometry (this) : dtw->screenGeometry (this);
-
-        /* It isn't guaranteed that the guest os set the video mode that
-         * we requested. So after all the resizing stuff set the clipping
-         * mask and the spacing shifter to the corresponding values. */
-        if (fSeamless)
-            setViewInSeamlessMode (scrGeo);
-
-#ifdef Q_WS_WIN
-        mPrevRegion = dtw->screenGeometry (this);
-#endif
-
-        /* Hide all but the central widget containing the console view. */
-        QList <QWidget*> list (findChildren <QWidget*> ());
-        QList <QWidget*> excludes;
-        excludes << centralWidget() << centralWidget()->findChildren <QWidget*> ();
-        foreach (QWidget *w, list)
-        {
-            if (!excludes.contains (w))
-            {
-                if (!w->isHidden())
-                {
-                    w->hide();
-                    mHiddenChildren.append (w);
-                }
-            }
-        }
-
-        /* Adjust colors and appearance. */
-        mErasePalette = centralWidget()->palette();
-        QPalette palette(mErasePalette);
-        palette.setColor (centralWidget()->backgroundRole(), Qt::black);
-        centralWidget()->setPalette (palette);
-        centralWidget()->setAutoFillBackground (!fSeamless);
-        mConsoleStyle = mConsole->frameStyle();
-        mConsole->setFrameStyle (QFrame::NoFrame);
-        mConsole->setMaximumSize (scrGeo.size());
-        mConsole->setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
-        mConsole->setVerticalScrollBarPolicy (Qt::ScrollBarAlwaysOff);
-    }
-    else
-    {
-        /* Reset the shifting spacers. */
-        mShiftingSpacerLeft->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-        mShiftingSpacerTop->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-        mShiftingSpacerRight->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-        mShiftingSpacerBottom->changeSize (0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-        /* Restore the previous scroll-view minimum size before the exiting
-         * fullscreen. Required for correct scroll-view and guest display
-         * update in SDL mode. */
-        mConsole->setMinimumSize (mPrevMinSize);
-
-#ifdef Q_WS_MAC
-        if (fSeamless)
-        {
-            /* Please note: All the stuff below has to be done before the
-             * window switch back to normal size. Qt changes the winId on the
-             * fullscreen switch and make this stuff useless with the old
-             * winId. So please be careful on rearrangement of the method
-             * calls. */
-            /* Undo all mac specific installations */
-            ::darwinSetShowsWindowTransparent (this, false);
-        }
-#endif
-
-        /* Adjust colors and appearance. */
-        clearMask();
-        centralWidget()->setPalette (mErasePalette);
-        centralWidget()->setAutoFillBackground (false);
-        mConsole->setFrameStyle (mConsoleStyle);
-        mConsole->setMaximumSize (mConsole->sizeHint());
-        mConsole->setHorizontalScrollBarPolicy (Qt::ScrollBarAsNeeded);
-        mConsole->setVerticalScrollBarPolicy (Qt::ScrollBarAsNeeded);
-
-        /* Show everything hidden when going fullscreen. */
-        foreach (QPointer <QWidget> child, mHiddenChildren)
-            if (child) child->show();
-        mHiddenChildren.clear();
-    }
-
-    /* Set flag for waiting host resize if it awaited during mode entering */
-    if ((mIsFullscreen || mIsSeamless) && (consoleSize != initialSize))
-        mIsWaitingModeResize = true;
-
-    if (!fOn)
-    {
-        /* Animation takes a bit long, the mini toolbar is still disappearing
-         * when switched to normal mode so hide it completely */
-        mMiniToolBar->hide();
-        mMiniToolBar->updateDisplay (false, true);
-    }
-
-    /* Toggle qt full-screen mode */
-    switchToFullscreen (fOn, fSeamless);
-
-    if (fOn)
-    {
-        mMiniToolBar->setSeamlessMode (fSeamless);
-        mMiniToolBar->updateDisplay (true, true);
-    }
-
-#ifdef Q_WS_MAC
-    if (fOn && fSeamless)
-    {
-        /* Please note: All the stuff below has to be done after the window has
-         * switched to fullscreen. Qt changes the winId on the fullscreen
-         * switch and make this stuff useless with the old winId. So please be
-         * careful on rearrangement of the method calls. */
-        ::darwinSetShowsWindowTransparent (this, true);
-    }
-#endif
-
-    /* Send guest size hint */
-    mConsole->toggleFSMode (consoleSize);
-
-    /* Process all console attributes changes and sub-widget hidings */
-    qApp->processEvents();
-
-    if (!mIsWaitingModeResize)
-        onExitFullscreen();
-
-    /* Unlock FS actions locked during modes toggling */
-    QTimer::singleShot (300, this, SLOT (unlockActionsSwitch()));
-
-#ifdef Q_WS_MAC /* wasHidden is wrong on the mac it seems. */
-    /** @todo figure out what is really wrong here... */
-    if (!wasHidden)
-        show();
-#else
-    if (wasHidden)
-        hide();
-#endif
-    return true;
-}
-void UIMachineLogic::switchToFullscreen (bool fOn, bool fSeamless)
-{
-#ifdef Q_WS_MAC
-# ifndef QT_MAC_USE_COCOA
-    /* setWindowState removes the window group connection somehow. So save it
-     * temporary. */
-    WindowGroupRef g = GetWindowGroup (::darwinToNativeWindow (this));
-# endif  /* !QT_MAC_USE_COCOA */
-    if (fSeamless)
-        if (fOn)
-        {
-            /* Save for later restoring */
-            mNormalGeometry = geometry();
-            mSavedFlags = windowFlags();
-            /* Remove the frame from the window */
-            const QRect fullscreen (qApp->desktop()->screenGeometry (qApp->desktop()->screenNumber (this)));
-            setParent (0, Qt::Window | Qt::FramelessWindowHint | (windowFlags() & 0xffff0000));
-            setGeometry (fullscreen);
-            /* Set it maximized */
-            setWindowState (windowState() ^ Qt::WindowMaximized);
-        }
-        else
-        {
-            /* Restore old values */
-            setParent (0, mSavedFlags);
-            setGeometry (mNormalGeometry);
-        }
-    else
-    {
-        /* Here we are going really fullscreen */
-        setWindowState (windowState() ^ Qt::WindowFullScreen);
-        sltChangePresentationMode (VBoxChangePresentationModeEvent(fOn));
-    }
-
-# ifndef QT_MAC_USE_COCOA
-    /* Reassign the correct window group. */
-    SetWindowGroup (::darwinToNativeWindow (this), g);
-# endif /* !QT_MAC_USE_COCOA */
-#else
-    NOREF (fOn);
-    NOREF (fSeamless);
-    setWindowState (windowState() ^ Qt::WindowFullScreen);
-#endif
-}
 void UIMachineLogic::setViewInSeamlessMode (const QRect &aTargetRect)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -24 +24 @@
 #define __UIMachineLogic_h__
 
-/* Global includes */
-#include <QObject>
-
 /* Local includes */
 #include "UIMachineDefs.h"
+#include <QIWithRetranslateUI.h>
 #ifdef VBOX_WITH_DEBUGGER_GUI
 # include <VBox/dbggui.h>
@@ -46 +44 @@
 class UIActionsPool;
 class UIMachineWindow;
-
-class UIMachineLogic : public QObject
+class UIDockIconPreview;
+class VBoxChangeDockIconUpdateEvent;
+
+class UIMachineLogic : public QIWithRetranslateUI3<QObject>
 {
     Q_OBJECT;
@@ -79 +79 @@
     void setPreventAutoClose(bool fIsPreventAutoClose) { m_fIsPreventAutoClose = fIsPreventAutoClose; }
 
+#ifdef Q_WS_MAC
+    void updateDockIcon();
+#endif /* Q_WS_MAC */
+
 protected:
 
@@ -97 +101 @@
     /* Protected members: */
     void addMachineWindow(UIMachineWindow *pMachineWindow);
+    void retranslateUi();
+#ifdef Q_WS_MAC
+    bool isDockIconPreviewEnabled() const { return m_fIsDockIconEnabled; }
+    void setDockIconPreviewEnabled(bool fIsDockIconPreviewEnabled) { m_fIsDockIconEnabled = fIsDockIconPreviewEnabled; }
+    void updateDockOverlay();
+#endif /* Q_WS_MAC */
 
     /* Prepare helpers: */
@@ -161 +171 @@
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef RT_OS_DARWIN /* Something is *really* broken in regards of the moc here */
     void sltDockPreviewModeChanged(QAction *pAction);
-#endif /* Q_WS_MAC */
+    void sltDockPreviewMonitorChanged(QAction *pAction);
+    void sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &event);
+#endif /* RT_OS_DARWIN */
 
 private:
@@ -197 +209 @@
 #endif
 
+#ifdef Q_WS_MAC
+    bool m_fIsDockIconEnabled;
+    UIDockIconPreview *m_pDockIconPreview;
+    QActionGroup *m_pDockPreviewSelectMonitorGroup;
+    int m_DockIconPreviewMonitor;
+#endif /* Q_WS_MAC */
+
     /* Friend classes: */
     friend class UIMachineWindow;
 
 #if 0 // TODO: Where to move that?
-# ifdef Q_WS_MAC
-    void fadeToBlack();
-    void fadeToNormal();
-# endif
-    bool toggleFullscreenMode(bool aOn, bool aSeamless);
-    void switchToFullscreen(bool aOn, bool aSeamless);
     void setViewInSeamlessMode(const QRect &aTargetRect);
 #endif

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

@@ -82 +82 @@
 # include "DockIconPreview.h"
 # include "DarwinKeyboard.h"
-# ifdef QT_MAC_USE_COCOA
-#  include "darwin/VBoxCocoaApplication.h"
-# else /* QT_MAC_USE_COCOA */
-#  include <Carbon/Carbon.h>
-# endif /* !QT_MAC_USE_COCOA */
+# include "darwin/VBoxCocoaApplication.h"
 # include <VBox/err.h>
-#endif /* defined (Q_WS_MAC) */
+#endif /* Q_WS_MAC */
 
 class VBoxViewport: public QWidget
@@ -216 +212 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     , m_fAccelerate2DVideo(bAccelerate2DVideo)
-#endif
-#if defined(Q_WS_MAC)
-# ifndef QT_MAC_USE_COCOA
-    , m_darwinEventHandlerRef(NULL)
-# endif /* !QT_MAC_USE_COCOA */
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+#ifdef Q_WS_MAC
     , m_darwinKeyModifiers(0)
     , m_fKeyboardGrabbed (false)
-    , mDockIconEnabled(true)
-#endif
+#endif /* Q_WS_MAC */
 {
 }
@@ -534 +526 @@
     NOREF(ok);
 #endif
-
-#if defined Q_WS_MAC
-    /* Dock icon update connection */
-    connect(&vboxGlobal(), SIGNAL(dockIconUpdateChanged(const VBoxChangeDockIconUpdateEvent &)),
-            this, SLOT(sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &)));
-
-    /* Overlay logo for the dock icon */
-    //mVirtualBoxLogo = ::darwinToCGImageRef("VirtualBox_cube_42px.png");
-    QString osTypeId = session().GetConsole().GetGuest().GetOSTypeId();
-
-    // TODO_NEW_CORE
-//    mDockIconPreview = new VBoxDockIconPreview(machineWindowWrapper(), vboxGlobal().vmGuestOSTypeIcon (osTypeId));
-
-# ifdef QT_MAC_USE_COCOA
-    /** @todo Carbon -> Cocoa */
-# else /* !QT_MAC_USE_COCOA */
-    /* Install the event handler which will proceed external window handling */
-    EventHandlerUPP eventHandler = ::NewEventHandlerUPP(::darwinOverlayWindowHandler);
-    EventTypeSpec eventTypes[] =
-    {
-        { kEventClassVBox, kEventVBoxShowWindow },
-        { kEventClassVBox, kEventVBoxHideWindow },
-        { kEventClassVBox, kEventVBoxMoveWindow },
-        { kEventClassVBox, kEventVBoxResizeWindow },
-        { kEventClassVBox, kEventVBoxDisposeWindow },
-        { kEventClassVBox, kEventVBoxUpdateDock }
-    };
-
-    mDarwinWindowOverlayHandlerRef = NULL;
-    ::InstallApplicationEventHandler(eventHandler, RT_ELEMENTS (eventTypes), &eventTypes[0], this, &mDarwinWindowOverlayHandlerRef);
-    ::DisposeEventHandlerUPP(eventHandler);
-# endif /* !QT_MAC_USE_COCOA */
-#endif
 }
 
@@ -628 +587 @@
             m_fPassCAD = true;
     }
-
-#ifdef Q_WS_MAC
-    QString strSettings = vboxGlobal().virtualBox().GetExtraData(VBoxDefs::GUI_RealtimeDockIconUpdateEnabled).toLower();
-    /* Default to true if it is an empty value: */
-    bool fIsDockIconEnabled = strSettings.isEmpty() || strSettings == "true";
-    setDockIconEnabled(fIsDockIconEnabled);
-    updateDockOverlay();
-#endif
 }
 
 void UIMachineView::cleanupCommon()
 {
-#if defined (Q_WS_PM)
+#ifdef Q_WS_PM
     bool ok = VBoxHlpUninstallKbdHook(0, winId(), UM_PREACCEL_CHAR);
     Assert(ok);
     NOREF(ok);
-#endif
-
-#if defined (Q_WS_WIN)
+#endif /* Q_WS_PM */
+
+#ifdef Q_WS_WIN
     if (gKbdHook)
         UnhookWindowsHookEx(gKbdHook);
     gView = 0;
-#endif
+#endif /* Q_WS_WIN */
 
 #ifdef Q_WS_MAC
@@ -657 +608 @@
     if (m_fKeyboardGrabbed)
         darwinGrabKeyboardEvents (false);
-# ifndef QT_MAC_USE_COCOA
-    if (mDarwinWindowOverlayHandlerRef)
-    {
-        ::RemoveEventHandler(mDarwinWindowOverlayHandlerRef);
-        mDarwinWindowOverlayHandlerRef = NULL;
-    }
-# endif /* !QT_MAC_USE_COCOA */
-    // TODO_NEW_CORE
-//    delete mDockIconPreview;
-    mDockIconPreview = NULL;
 #endif /* Q_WS_MAC */
 }
@@ -1005 +946 @@
             }
 #endif /* defined (Q_WS_WIN32) */
-#if defined (Q_WS_MAC)
+#ifdef Q_WS_MAC
             /* Install/remove the keyboard event handler: */
             case QEvent::WindowActivate:
@@ -1013 +954 @@
                 darwinGrabKeyboardEvents(false);
                 break;
-#endif /* defined (Q_WS_MAC) */
+#endif /* Q_WS_MAC */
             default:
                 break;
@@ -1079 +1020 @@
     }
 
-#ifdef Q_WS_MAC
-    /* Update Dock Overlay: */
-    updateDockOverlay();
-#endif /* Q_WS_MAC */
-
     m_previousState = state;
 }
@@ -1135 +1071 @@
     }
 }
-
-#ifdef Q_WS_MAC
-void UIMachineView::sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &event)
-{
-    setDockIconEnabled(event.mChanged);
-    updateDockOverlay();
-}
-#endif
 
 void UIMachineView::focusEvent(bool fHasFocus, bool fReleaseHostKey /* = true */)
@@ -1413 +1341 @@
         }
 #elif defined (Q_WS_MAC)
-        // TODO_NEW_CORE
         if (pUniKey && pUniKey[0] && !pUniKey[1])
             processed = machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence(Qt::UNICODE_ACCEL + QChar(pUniKey[0]).toUpper().unicode()));
@@ -1689 +1616 @@
 {
     updateSliders();
-#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
-    QRect rectangle = viewport()->geometry();
-    PostBoundsChanged(rectangle);
-#endif /* Q_WS_MAC */
     return QAbstractScrollArea::resizeEvent(pEvent);
 }
@@ -1698 +1621 @@
 void UIMachineView::moveEvent(QMoveEvent *pEvent)
 {
-#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
-    QRect r = viewport()->geometry();
-    PostBoundsChanged (r);
-#endif /* Q_WS_MAC */
     return QAbstractScrollArea::moveEvent(pEvent);
 }
@@ -1714 +1633 @@
 #ifdef Q_WS_MAC
         /* Update the dock icon if we are in the running state */
-            // TODO_NEW_CORE
-//        if (uisession()->isRunning())
-//            updateDockIcon();
-#endif
+        if (uisession()->isRunning())
+            updateDockIcon();
+#endif /* Q_WS_MAC */
         return;
     }
@@ -1725 +1643 @@
     {
         m_pFrameBuffer->paintEvent(pPaintEvent);
-//        updateDockIcon();
+        updateDockIcon();
     }
     else
-#endif
+#endif /* VBOX_GUI_USE_QUARTZ2D */
     {
         /* We have a snapshot for the paused state: */
@@ -1740 +1658 @@
         viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
 #ifdef Q_WS_MAC
-//        updateDockIcon();
-#endif
+        updateDockIcon();
+#endif /* Q_WS_MAC */
     }
 }
@@ -2584 +2502 @@
 }
 
-#if defined(Q_WS_MAC)
+#ifdef Q_WS_MAC
+CGImageRef UIMachineView::vmContentImage()
+{
+    if (!m_pauseShot.isNull())
+    {
+        CGImageRef pauseImg = ::darwinToCGImageRef(&m_pauseShot);
+        /* Use the pause image as background */
+        return pauseImg;
+    }
+    else
+    {
+# ifdef VBOX_GUI_USE_QUARTZ2D
+        if (mode() == VBoxDefs::Quartz2DMode)
+        {
+            /* If the render mode is Quartz2D we could use the CGImageRef
+             * of the framebuffer for the dock icon creation. This saves
+             * some conversion time. */
+            CGImageRef image = static_cast<UIFrameBufferQuartz2D*>(m_pFrameBuffer)->imageRef();
+            CGImageRetain(image); /* Retain it, cause the consumer will release it. */
+            return image;
+        }
+        else
+# endif /* VBOX_GUI_USE_QUARTZ2D */
+            /* In image mode we have to create the image ref out of the
+             * framebuffer */
+            return frameBuffertoCGImageRef(m_pFrameBuffer);
+    }
+    return 0;
+}
+
+CGImageRef UIMachineView::frameBuffertoCGImageRef(UIFrameBuffer *pFrameBuffer)
+{
+    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
+    Assert(cs);
+    /* Create the image copy of the framebuffer */
+    CGDataProviderRef dp = CGDataProviderCreateWithData(pFrameBuffer, pFrameBuffer->address(), pFrameBuffer->bitsPerPixel() / 8 * pFrameBuffer->width() * pFrameBuffer->height(), NULL);
+    Assert(dp);
+    CGImageRef ir = CGImageCreate(pFrameBuffer->width(), pFrameBuffer->height(), 8, 32, pFrameBuffer->bytesPerLine(), cs,
+                                  kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host, dp, 0, false,
+                                  kCGRenderingIntentDefault);
+    Assert(ir);
+    CGDataProviderRelease(dp);
+    CGColorSpaceRelease(cs);
+
+    return ir;
+}
+
 void UIMachineView::updateDockIcon()
 {
-    // TODO_NEW_CORE
-//    if (mDockIconEnabled)
-//    {
-//        if (!m_pauseShot.isNull())
-//        {
-//            CGImageRef pauseImg = ::darwinToCGImageRef (&m_pauseShot);
-//            /* Use the pause image as background */
-//            mDockIconPreview->updateDockPreview (pauseImg);
-//            CGImageRelease (pauseImg);
-//        }
-//        else
-//        {
-//# if defined (VBOX_GUI_USE_QUARTZ2D)
-//            if (mode() == VBoxDefs::Quartz2DMode)
-//            {
-//                /* If the render mode is Quartz2D we could use the CGImageRef
-//                 * of the framebuffer for the dock icon creation. This saves
-//                 * some conversion time. */
-//                mDockIconPreview->updateDockPreview(static_cast<UIFrameBufferQuartz2D*>(m_pFrameBuffer)->imageRef());
-//            }
-//            else
-//# endif
-//                /* In image mode we have to create the image ref out of the
-//                 * framebuffer */
-//                mDockIconPreview->updateDockPreview(m_pFrameBuffer);
-//        }
-//    }
-}
-
-void UIMachineView::updateDockOverlay()
-{
-    /* Only to an update to the realtime preview if this is enabled by the user
-     * & we are in an state where the framebuffer is likely valid. Otherwise to
-     * the overlay stuff only. */
-    // TODO_NEW_CORE
-//    if (mDockIconEnabled &&
-//        (machineState() == KMachineState_Running ||
-//         machineState() == KMachineState_Paused ||
-//         machineState() == KMachineState_Teleporting ||
-//         machineState() == KMachineState_LiveSnapshotting ||
-//         machineState() == KMachineState_Restoring ||
-//         machineState() == KMachineState_TeleportingPausedVM ||
-//         machineState() == KMachineState_TeleportingIn ||
-//         machineState() == KMachineState_Saving))
-//        updateDockIcon();
-//    else
-//        mDockIconPreview->updateDockOverlay();
+    machineLogic()->updateDockIcon();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -42 +42 @@
 class UIMachineLogic;
 class VBoxGlobalSettings;
-#ifdef Q_WS_MAC
-class VBoxChangeDockIconUpdateEvent;
-class VBoxDockIconPreview;
-#endif /* Q_WS_MAC */
 
 class UIMachineView : public QAbstractScrollArea
@@ -76 +72 @@
     /* Public members: */
     virtual void normalizeGeometry(bool /* bAdjustPosition = false */) {}
-
-#if defined(Q_WS_MAC)
-    void updateDockIcon();
-    void updateDockOverlay();
-    void setMouseCoalescingEnabled(bool fOn);
-    void setDockIconEnabled(bool aOn) { mDockIconEnabled = aOn; };
-#endif
 
 signals:
@@ -137 +126 @@
     void updateSliders();
 
+#ifdef Q_WS_MAC
+    void updateDockIcon();
+    void setMouseCoalescingEnabled(bool fOn);
+    CGImageRef vmContentImage();
+    CGImageRef frameBuffertoCGImageRef(UIFrameBuffer *pFrameBuffer);
+#endif /* Q_WS_MAC */
+
     /* Prepare routines: */
     virtual void prepareFrameBuffer();
@@ -165 +161 @@
     /* Session callback handlers: */
     virtual void sltMouseCapturedStatusChanged();
-
-private slots:
-
-#ifdef Q_WS_MAC
-    /* Dock icon update handler */
-    void sltChangeDockIconUpdate(const VBoxChangeDockIconUpdateEvent &event);
-#endif
 
 private:
@@ -254 +243 @@
 #endif
 
-#if defined(Q_WS_MAC)
-# ifndef QT_MAC_USE_COCOA
-    /** Event handler reference. NULL if the handler isn't installed. */
-    EventHandlerRef m_darwinEventHandlerRef;
-# endif /* !QT_MAC_USE_COCOA */
+#ifdef Q_WS_MAC
     /** The current modifier key mask. Used to figure out which modifier
      *  key was pressed when we get a kEventRawKeyModifiersChanged event. */
     UInt32 m_darwinKeyModifiers;
     bool m_fKeyboardGrabbed;
-#endif
+#endif /* Q_WS_MAC */
 
     QPixmap m_pauseShot;
-#if defined(Q_WS_MAC)
-# if !defined (QT_MAC_USE_COCOA)
-    EventHandlerRef mDarwinWindowOverlayHandlerRef;
-# endif
-    VBoxDockIconPreview *mDockIconPreview;
-    bool mDockIconEnabled;
-#endif
 
     /* Friend classes: */
+    friend class UIMachineLogic;
     friend class UIMachineWindowFullscreen;
     friend class UIFrameBuffer;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -154 +154 @@
         sltAdditionsStateChanged();
         sltMouseCapabilityChanged();
+
+        retranslateUi();
     }
 }

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

@@ -78 +78 @@
         sltAdditionsStateChanged();
         sltMouseCapabilityChanged();
+
+        retranslateUi();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -146 +146 @@
         sltAdditionsStateChanged();
         sltMouseCapabilityChanged();
+
+        retranslateUi();
     }
 }