Changeset 15804 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

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/include

Files:

• VBoxConsoleView.h (modified) (3 diffs)
• VBoxConsoleWnd.h (modified) (2 diffs)
• VBoxDockIconPreview.h (added)
• VBoxUtils.h (modified) (1 diff)

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();