Changeset 2412 in vbox for trunk/src

Timestamp:

Apr 28, 2007 6:49:40 PM (18 years ago)

Author:

vboxsync

Message:

Some more messing about with the dock.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• include/VBoxConsoleWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -242 +242 @@
         images/welcome.png \
         images/about_600px.png \
+        images/dock_0.png \
+        images/dock_1.png \
     images/dock_128x128_transparent.png
 

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

@@ -277 +277 @@
     CGImageRef dockImgStateSaving;
     CGImageRef dockImgStateRestoring;
+    CGImageRef dockImgBack75x75;
+    CGImageRef dockImgBack100x75;
+    CGImageRef dockImgOS;
 #endif 
 };

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

@@ -161 +161 @@
     , dockImgStateSaving (NULL)
     , dockImgStateRestoring (NULL)
+    , dockImgBack75x75 (NULL)
+    , dockImgBack100x75 (NULL)
+    , dockImgOS (NULL)
 #endif 
 {
@@ -530 +533 @@
     dockImgStateSaving    = ::DarwinCreateDockBadge ("state_saving_16px.png");
     dockImgStateRestoring = ::DarwinCreateDockBadge ("state_restoring_16px.png");
+    dockImgBack75x75      = ::DarwinCreateDockBadge ("dock_0.png");
+    dockImgBack100x75     = ::DarwinCreateDockBadge ("dock_1.png");
+    SetApplicationDockTileImage (dockImgOS);
     OverlayApplicationDockTileImage (dockImgStateRunning);
 #endif 
@@ -548 +554 @@
     if (dockImgStateRestoring)
         CGImageRelease (dockImgStateRestoring);
+    if (dockImgBack75x75)
+        CGImageRelease (dockImgBack75x75);
+    if (dockImgBack100x75)
+        CGImageRelease (dockImgBack100x75);
+    if (dockImgOS)
+        CGImageRelease (dockImgOS);
 #endif 
 }
@@ -714 +726 @@
     connect (console, SIGNAL (machineStateChanged (CEnums::MachineState)),
              this, SLOT (updateMachineState (CEnums::MachineState)));
+
+#ifdef Q_WS_MAC
+    QString osType = cmachine.GetOSType().GetId();
+# if 0
+    QImage osImg75x75 = vboxGlobal().vmGuestOSTypeIcon (osType).convertToImage().smoothScale (75, 75);
+    QImage osImg = QImage::fromMimeSource ("dock_0.png");
+    bitBlt (&osImg, 25, 22, 
+            &osImg75x75, 0, 0,
+            75, 75, /* conversion_flags */ 0);
+# else
+    QImage osImg100x75 = vboxGlobal().vmGuestOSTypeIcon (osType).convertToImage().smoothScale (100, 75);
+    QImage osImg = QImage::fromMimeSource ("dock_1.png");
+    bitBlt (&osImg, 14, 22, 
+            &osImg100x75, 0, 0,
+            100, 75, /* conversion_flags */ 0);
+# endif 
+    if (dockImgOS)
+        CGImageRelease (dockImgOS);
+    dockImgOS = ::DarwinQImageToCGImage (&osImg);
+#endif
 
     /* set the correct initial machine_state value */
@@ -1537 +1569 @@
         else
             img = NULL;
-        RestoreApplicationDockTileImage();
+        SetApplicationDockTileImage (dockImgOS);
         if (img)
             OverlayApplicationDockTileImage (img);