Changeset 8211 in vbox for trunk/src

Timestamp:

Apr 21, 2008 9:31:21 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt-OSX: Like on Windows setting the main window icon isn't necessary on MacOS X.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox/src/VBoxSelectorWnd.cpp (modified) (1 diff)
• VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (5 diffs)
• VirtualBox4/src/VBoxSelectorWnd.cpp (modified) (1 diff)

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

@@ -142 +142 @@
     idle_timer = new QTimer (this);
 
-#ifndef Q_WS_WIN
-    /* default application icon (will change to the VM-specific icon in
-     * openView()). On Win32, it's built-in to the executable. */
+#if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+    /* The aplication icon. On Win32, it's built-in to the executable. On Mac
+     * OS X the icon referenced in info.plist is used. */
     setIcon (QPixmap::fromMimeSource ("VirtualBox_48px.png"));
 #endif

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

@@ -392 +392 @@
     statusBar();
 
-#ifndef Q_WS_WIN
-    /* Application icon. On Win32, it's built-in to the executable. */
+#if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+    /* The aplication icon. On Win32, it's built-in to the executable. On Mac
+     * OS X the icon referenced in info.plist is used. */
     setIcon (QPixmap::fromMimeSource ("VirtualBox_48px.png"));
 #endif

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

@@ -57 +57 @@
 #include "VBoxUtils.h"
 #include "VBoxIChatTheaterWrapper.h"
+//#include <Carbon/Carbon.h>
 /* Qt includes */
 #include <QPainter>
@@ -145 +146 @@
     idle_timer = new QTimer (this);
 
-#ifndef Q_WS_WIN
-    /* default application icon (will change to the VM-specific icon in
-     * openView()). On Win32, it's built-in to the executable. */
+#if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+    /* The default application icon (will change to the VM-specific icon in
+     * openView()). On Win32, it's built-in to the executable. On Mac OS X the
+     * icon referenced in info.plist is used. */
     setWindowIcon (QIcon (":/VirtualBox_48px.png"));
 #endif
@@ -594 +596 @@
 #ifdef Q_WS_MAC
 # ifdef VBOX_WITH_ICHAT_THEATER
+//    int setAttr[] = { kHIWindowBitDoesNotShowBadgeInDock, 0 };
+//    HIWindowChangeAttributes (window, setAttr, NULL);
     initSharedAVManager();
 # endif
@@ -2765 +2769 @@
          * in the paint engine. */
         HIViewReshapeStructure (::darwinToHIViewRef (console->viewport()));
+//        HIWindowInvalidateShadow (::darwinToWindowRef (console->viewport()));
 //        ReshapeCustomWindow (mapToWindowRef (this));
     }
@@ -2787 +2792 @@
 //        ReshapeCustomWindow (reinterpret_cast <WindowPtr> (winId()));
         QMainWindow::setMask (region);
+//        HIWindowInvalidateShadow (::darwinToWindowRef (console->viewport()));
     }
 #else

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

@@ -390 +390 @@
     statusBar();
 
-#ifndef Q_WS_WIN
-    /* application icon. On Win32, it's built-in to the executable. */
+#if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
+    /* The aplication icon. On Win32, it's built-in to the executable. On Mac
+     * OS X the icon referenced in info.plist is used. */
     setWindowIcon (QIcon (":/VirtualBox_48px.png"));
 #endif