Changeset 2311 in vbox for trunk/src/VBox

Timestamp:

Apr 23, 2007 8:51:39 AM (18 years ago)

Author:

vboxsync

Message:

Attempt at the ugly Qt3 toolbars on Mac OS X.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile (modified) (2 diffs)
• include/VBoxToolBar.h (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (1 diff)
• ui/VBoxSnapshotsWgt.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -154 +154 @@
 VirtualBox_SOURCES.darwin = \
         src/darwin/DarwinKeyboard.cpp \
-        src/darwin/DarwinCursor.cpp
+        src/darwin/DarwinCursor.cpp \
+        src/darwin/VBoxAquaStyle.cpp
 
 ## @todo how to detect what tool is used?
@@ -256 +257 @@
 VirtualBox.nls_SOURCES += $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS_QT)))
 VirtualBox.nls_MODE = 644
+
+
+#
+# Testcase for the darwin keyboard routines.
+#
+ifdef VBOX_WITH_TESTCASES
+PROGRAMS.darwin += tstDarwinKeyboard
+tstDarwinKeyboard_TEMPLATE = VBOXR3TSTEXE
+tstDarwinKeyboard_INCS = include
+tstDarwinKeyboard_SOURCES = \
+        src/darwin/tstDarwinKeyboard.cpp \
+        src/darwin/DarwinKeyboard.cpp
+tstDarwinKeyboard_LDFLAGS = -framework IOKit -framework Carbon
+tstDarwinKeyboard_LIBS = \
+        $(LIB_RUNTIME)
+endif
 
 

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

@@ -28 +28 @@
 #include <qmainwindow.h>
 #include <qobjectlist.h>
+#ifdef Q_WS_MAC
+# include "VBoxAquaStyle.h"
+#endif
 
 /**
@@ -88 +91 @@
         }
     }
+
+#ifdef Q_WS_MAC
+    /** 
+     * This is a temporary hack, we'll set the style globally later. 
+     */
+    void setMacStyle() 
+    {
+        /* 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;
+
+        /** @todo the separator */
+    }
+#endif 
 };
 

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

@@ -485 +485 @@
     vmStartAction->addTo (vmTools);
     vmDiscardAction->addTo (vmTools);
+#ifdef Q_WS_MAC
+    vmTools->setMacStyle();
+#endif 
 
     /* add actions to menubar */

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxDiskImageManagerDlg.ui.h

@@ -351 +351 @@
     toolBar->addSeparator();
     imRefreshAction->addTo (toolBar);
+#ifdef Q_WS_MAC
+    toolBar->setMacStyle();
+#endif 
 
 

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxSnapshotsWgt.ui.h

@@ -304 +304 @@
     toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
     VBoxSnapshotsWgtLayout->insertWidget (0, toolBar);
+#ifdef Q_WS_MAC
+    toolBar->setMacStyle();
+#endif 
 
     /* context menu */