Changeset 2411 in vbox for trunk

Timestamp:

Apr 28, 2007 6:01:48 PM (18 years ago)

Author:

vboxsync

Message:

playing with the dock.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -159 +159 @@
         src/darwin/DarwinKeyboard.cpp \
         src/darwin/DarwinCursor.cpp \
-        src/darwin/VBoxAquaStyle.cpp
+        src/darwin/VBoxAquaStyle.cpp \
+        src/darwin/VBoxUtils-darwin.cpp
 
 ## @todo how to detect what tool is used?

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

@@ -241 +241 @@
         images/vdm_remove_disabled_22px.png \
         images/welcome.png \
-        images/about_600px.png
+        images/about_600px.png \
+    images/dock_128x128_transparent.png
 
 TRANSLATIONS = \

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

@@ -34 +34 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-#include <VBox/dbggui.h>
-#endif
+# include <VBox/dbggui.h>
+#endif
+#ifdef Q_WS_MAC
+# undef PAGE_SIZE
+# undef PAGE_SHIFT
+# include <Carbon/Carbon.h>
+#endif 
 
 class QAction;
@@ -265 +270 @@
     PDBGGUI dbg_gui;
 #endif
+
+#ifdef Q_WS_MAC
+    // Dock images.
+    CGImageRef dockImgStateRunning;
+    CGImageRef dockImgStatePaused;
+    CGImageRef dockImgStateSaving;
+    CGImageRef dockImgStateRestoring;
+#endif 
 };
 

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

@@ -194 +194 @@
 };
 
+
+#ifdef Q_WS_MAC
+# undef PAGE_SIZE
+# undef PAGE_SHIFT
+# include <Carbon/Carbon.h>
+class QImage;
+class QPixmap;
+CGImageRef DarwinQImageToCGImage (const QImage *aImage);
+CGImageRef DarwinQPixmapToCGImage (const QPixmap *aPixmap);
+CGImageRef DarwinQPixmapFromMimeSourceToCGImage (const char *aSource);
+CGImageRef DarwinCreateDockBadge (const char *aSource);
+#endif /* Q_WS_MAC */
+
 #endif // __VBoxUtils_h__
 

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

@@ -32 +32 @@
 #include "VBoxDiskImageManagerDlg.h"
 #include "VBoxSharedFoldersSettings.h"
+#include "VBoxUtils.h"
 #include "QIStateIndicator.h"
 #include "QIStatusBar.h"
@@ -155 +156 @@
     , dbg_gui (NULL)
 #endif
+#ifdef Q_WS_MAC
+    , dockImgStateRunning (NULL)
+    , dockImgStatePaused (NULL)
+    , dockImgStateSaving (NULL)
+    , dockImgStateRestoring (NULL)
+#endif 
 {
     if (aSelf)
@@ -516 +523 @@
                  this, SLOT (dbgShowCommandLine()));
 #endif
+
+#ifdef Q_WS_MAC
+    /* prepare the dock images */
+    dockImgStateRunning   = ::DarwinCreateDockBadge ("state_running_16px.png");
+    dockImgStatePaused    = ::DarwinCreateDockBadge ("state_paused_16px.png");
+    dockImgStateSaving    = ::DarwinCreateDockBadge ("state_saving_16px.png");
+    dockImgStateRestoring = ::DarwinCreateDockBadge ("state_restoring_16px.png");
+    OverlayApplicationDockTileImage (dockImgStateRunning);
+#endif 
 }
 
@@ -522 +538 @@
     if (mUsbLedTip)
         delete mUsbLedTip;
+#ifdef Q_WS_MAC
+    /* release the dock images */
+    if (dockImgStateRunning)
+        CGImageRelease (dockImgStateRunning);
+    if (dockImgStatePaused)
+        CGImageRelease (dockImgStatePaused);
+    if (dockImgStateSaving)
+        CGImageRelease (dockImgStateSaving);
+    if (dockImgStateRestoring)
+        CGImageRelease (dockImgStateRestoring);
+#endif 
 }
 
@@ -1493 +1520 @@
             vmDisableMouseIntegrAction->setEnabled (false);
     }
+#ifdef Q_WS_MAC
+    if (1)//(element & DockTile)
+    {
+        //CGContextDrawImage
+        //HIViewDrawCGImage();
+        //CGImageAlphaInfo
+        CGImageRef img;
+        if (machine_state == CEnums::Running)
+            img = dockImgStateRunning;
+        else if (machine_state == CEnums::Paused)
+            img = dockImgStatePaused;
+        else if (machine_state == CEnums::Restoring)
+            img = dockImgStateRestoring;
+        else if (machine_state == CEnums::Saving)
+            img = dockImgStateSaving;
+        else
+            img = NULL;
+        RestoreApplicationDockTileImage();
+        if (img)
+            OverlayApplicationDockTileImage (img);
+    }
+#endif
 }