Changeset 7282 in vbox

Timestamp:

Mar 4, 2008 4:59:05 PM (17 years ago)

Author:

vboxsync

Message:

Mac OS X: Build on the mac as from now.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• include/VBoxToolBar.h (modified) (2 diffs)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/darwin/VBoxUtils-darwin.cpp (modified) (3 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (1 diff)

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

@@ -439 +439 @@
         src/darwin/DarwinKeyboard.cpp \
         src/darwin/DarwinCursor.cpp \
-        src/darwin/VBoxAquaStyle.cpp \
         src/darwin/VBoxUtils-darwin.cpp \
         src/VBoxFBQuartz2D.cpp
+#       src/darwin/VBoxAquaStyle.cpp \
 
 ifdef VBOX_WITH_ICHAT_THEATER
@@ -522 +522 @@
 endif
 VirtualBox_LDFLAGS.os2    = -Zlinker /PM:PM -Zno-fork
-VirtualBox_LDFLAGS.darwin = -framework IOKit
+VirtualBox_LDFLAGS.darwin = -framework IOKit -framework AppKit -framework ApplicationServices -framework Foundation -lz
 ifdef VBOX_WITH_ICHAT_THEATER
- VirtualBox_LDFLAGS.darwin += -framework Foundation -framework AppKit -framework InstantMessage -framework QuartzCore
+ VirtualBox_LDFLAGS.darwin += -framework InstantMessage -framework QuartzCore
 endif
 VirtualBox_LIBS.win       = \

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxToolBar.h

@@ -26 +26 @@
 #include <QContextMenuEvent>
 #ifdef Q_WS_MAC
-# include "VBoxAquaStyle.h"
+//# include "VBoxAquaStyle.h"
 #endif
 
@@ -78 +78 @@
     {
         /* self */
-        QStyle *qs = &VBoxAquaStyle::instance();
-        setStyle(qs);
-
-        /* the buttons */
-        QObjectList *list = queryList ("QToolButton");
-        QObjectListIt it (*list);
-        QObject *obj;
-        while ((obj = it.current()) != 0)
-        {
-            QToolButton *btn = ::qt_cast <QToolButton *> (obj);
-            btn->setStyle (&VBoxAquaStyle::instance());
-            ++ it;
-        }
-        delete list;
+//        QStyle *qs = &VBoxAquaStyle::instance();
+//        setStyle(qs);
+//
+//        /* the buttons */
+//        QObjectList *list = queryList ("QToolButton");
+//        QObjectListIt it (*list);
+//        QObject *obj;
+//        while ((obj = it.current()) != 0)
+//        {
+//            QToolButton *btn = ::qt_cast <QToolButton *> (obj);
+//            btn->setStyle (&VBoxAquaStyle::instance());
+//            ++ it;
+//        }
+//        delete list;
 
         /** @todo the separator */

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

@@ -2527 +2527 @@
         }
 #elif defined (Q_WS_MAC)
-        if (aUniKey && aUniKey [0] && !aUniKey [1])
-            processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
-                                                     QChar (aUniKey [0]).upper().unicode()),
-                                       mMainWnd->menuBar());
+#warning port me
+//        if (aUniKey && aUniKey [0] && !aUniKey [1])
+//            processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
+//                                                     QChar (aUniKey [0]).upper().unicode()),
+//                                       mMainWnd->menuBar());
 
         /* Don't consider the hot key as pressed since the guest never saw

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

@@ -823 +823 @@
     QImage osImg100x75 = vboxGlobal().vmGuestOSTypeIcon (osTypeId).convertToImage().smoothScale (100, 75);
     QImage osImg = QImage (":/dock_1.png");
-    bitBlt (&osImg, 14, 22,
-            &osImg100x75, 0, 0,
-            100, 75, /* conversion_flags */ 0);
-    QImage VBoxOverlay = QImage (":/VirtualBox_48px.png");
-    bitBlt (&osImg, osImg.width() - VBoxOverlay.width(), osImg.height() - VBoxOverlay.height(),
-            &VBoxOverlay, 0, 0,
-            VBoxOverlay.width(), VBoxOverlay.height(), /* conversion_flags */ 0);
-    if (dockImgOS)
-        CGImageRelease (dockImgOS);
+#warning port me
+//    bitBlt (&osImg, 14, 22,
+//            &osImg100x75, 0, 0,
+//            100, 75, /* conversion_flags */ 0);
+//    QImage VBoxOverlay = QImage (":/VirtualBox_48px.png");
+//    bitBlt (&osImg, osImg.width() - VBoxOverlay.width(), osImg.height() - VBoxOverlay.height(),
+//            &VBoxOverlay, 0, 0,
+//            VBoxOverlay.width(), VBoxOverlay.height(), /* conversion_flags */ 0);
+//    if (dockImgOS)
+//        CGImageRelease (dockImgOS);
     dockImgOS = ::DarwinQImageToCGImage (&osImg);
     SetApplicationDockTileImage (dockImgOS);

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

@@ -2025 +2025 @@
     Q3Process openApp (QString("/usr/bin/open"));
     openApp.addArgument (qApp->applicationDirPath() + "/UserManual.pdf");
-    openApp.launch ("");
+    openApp.launch (QString(""));
 #endif
 #endif /* VBOX_OSE */

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp

@@ -76 +76 @@
 CGImageRef DarwinQImageFromMimeSourceToCGImage (const char *aSource)
 {
-    QImage qim = QImage::fromMimeSource (QString(":/") + aSource);
+    QImage qim (QString(":/") + aSource);
     Assert (!qim.isNull());
     return DarwinQImageToCGImage (&qim);
@@ -102 +102 @@
 CGImageRef DarwinQPixmapFromMimeSourceToCGImage (const char *aSource)
 {
-    QPixmap qpm = QPixmap::fromMimeSource (QString(":/" + aSource);
+    QPixmap qpm (QString(":/") + aSource);
     Assert (!qpm.isNull());
     return DarwinQPixmapToCGImage (&qpm);
@@ -126 +126 @@
 
     /* load the badge */
-    QPixmap badge = QPixmap::fromMimeSource (aSource);
+    QPixmap badge (aSource);
     Assert (!badge.isNull());
 

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxNewVMWzd.ui.h

@@ -185 +185 @@
     /* setup minimum width for the sizeHint to be calculated correctly */
 #warning port me: check this
-    int wid = spacerItem->minimumSize().width();
+    int wid = 1;
 //    int wid = widthSpacer->minimumSize().width();
     txWelcome->setMinimumWidth (wid);