Changeset 24107 in vbox for trunk/src

Timestamp:

Oct 27, 2009 9:08:43 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: initial set of native Cocoa controls

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• include/QIDialogButtonBox.h (modified) (2 diffs)
• include/VBoxCocoaHelper.h (added)
• include/VBoxCocoaSpecialControls.h (added)
• include/VBoxSpecialControls.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/include/QIHelpButton.h ) (5 diffs)
• include/VBoxUtils-darwin.h (modified) (4 diffs)
• include/VBoxVMLogViewer.h (modified) (3 diffs)
• src/QIDialogButtonBox.cpp (modified) (2 diffs)
• src/VBoxSpecialControls.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/QIHelpButton.cpp ) (12 diffs)
• src/VBoxVMLogViewer.cpp (modified) (11 diffs)
• src/darwin/VBoxCocoaSpecialControls.mm (added)
• src/darwin/VBoxUtils-darwin-cocoa.mm (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-cocoa.m ) (4 diffs)

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

@@ -272 +272 @@
         include/QITreeWidget.h \
         include/QIMainDialog.h \
-        include/QIHelpButton.h \
         include/QIDialog.h \
         include/QIFileDialog.h \
@@ -335 +334 @@
         include/VBoxImportApplianceWzd.h \
         include/VBoxExportApplianceWgt.h \
-        include/VBoxExportApplianceWzd.h
+        include/VBoxExportApplianceWzd.h \
+        include/VBoxSpecialControls.h
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
@@ -374 +374 @@
         src/QIMainDialog.cpp \
         src/QILineEdit.cpp \
-        src/QIHelpButton.cpp \
         src/QISplitter.cpp \
         src/QITreeView.cpp \
@@ -435 +434 @@
         src/VBoxImportApplianceWzd.cpp \
         src/VBoxExportApplianceWgt.cpp \
-        src/VBoxExportApplianceWzd.cpp
+        src/VBoxExportApplianceWzd.cpp \
+        src/VBoxSpecialControls.cpp
 
 ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
@@ -473 +473 @@
 
 ifdef VBOX_WITH_COCOA_QT
+ VirtualBox_DEFS += VBOX_DARWIN_USE_NATIVE_CONTROLS
  VirtualBox_SOURCES.darwin += \
         src/darwin/VBoxCocoaApplication.m \
-        src/darwin/VBoxUtils-darwin-cocoa.m \
-        src/darwin/VBoxDockIconPreview-cocoa.m
+        src/darwin/VBoxUtils-darwin-cocoa.mm \
+        src/darwin/VBoxCocoaSpecialControls.mm \
+        src/darwin/VBoxDockIconPreview-cocoa.m
+ VirtualBox_QT_MOCHDRS.darwin = \
+        include/VBoxCocoaSpecialControls.h
+
 else
  VirtualBox_SOURCES.darwin += \

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

@@ -32 +32 @@
 class QBoxLayout;
 
-class QIHelpButton;
+class VBoxHelpButton;
 
 class QIDialogButtonBox: public QIWithRetranslateUI<QDialogButtonBox>
@@ -60 +60 @@
 private:
 
-    QPointer<QIHelpButton> mHelpButton;
+    QPointer<VBoxHelpButton> mHelpButton;
 };
 

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

@@ -2 +2 @@
  *
  * VBox frontends: Qt GUI ("VirtualBox"):
- * QIHelpButton class declaration
+ * VBoxSpecialButtons declarations
  */
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
-#ifndef __QIHelpButton_h_
-#define __QIHelpButton_h_
-
+#ifndef ___VBoxSpecialControls_h__
+#define ___VBoxSpecialControls_h__
+
+/* VBox includes */
 #include "QIWithRetranslateUI.h"
 
@@ -29 +30 @@
 #include <QPushButton>
 
-class QIHelpButton: public QIWithRetranslateUI<QPushButton>
-{
-    Q_OBJECT;
-
-public:
-
-    QIHelpButton (QWidget *aParent = NULL);
+#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
+
+/* VBox includes */
+#include "VBoxCocoaSpecialControls.h"
+
+/********************************************************************************
+ *
+ * A mini cancel button in the native Cocoa version.
+ *
+ ********************************************************************************/
+class VBoxMiniCancelButton: public QAbstractButton
+{
+    Q_OBJECT;
+
+public:
+    VBoxMiniCancelButton (QWidget *aParent = 0);
+
+    void setToolTip (const QString &aTip) { mButton->setToolTip (aTip); }
+
+protected:
+    void paintEvent (QPaintEvent * /* aEvent */) {}
+
+private:
+    VBoxCocoaButton *mButton;
+};
+
+/********************************************************************************
+ *
+ * A help button in the native Cocoa version.
+ *
+ ********************************************************************************/
+class VBoxHelpButton: public QPushButton
+{
+    Q_OBJECT;
+
+public:
+    VBoxHelpButton (QWidget *aParent = 0);
+
+    void setToolTip (const QString &aTip) { mButton->setToolTip (aTip); }
+
+    void initFrom (QPushButton * /* aOther */) {}
+
+protected:
+    void paintEvent (QPaintEvent * /* aEvent */) {}
+
+private:
+    VBoxCocoaButton *mButton;
+};
+
+/********************************************************************************
+ *
+ * A segmented button in the native Cocoa version.
+ *
+ ********************************************************************************/
+class VBoxSegmentedButton: public VBoxCocoaSegmentedButton
+{
+    Q_OBJECT;
+
+public:
+    VBoxSegmentedButton (int aCount, QWidget *aParent = 0);
+
+    void setIcon (int /* aSegment */, const QIcon & /* aIcon */) {}
+};
+
+/********************************************************************************
+ *
+ * A search field in the native Cocoa version.
+ *
+ ********************************************************************************/
+class VBoxSearchField: public VBoxCocoaSearchField
+{
+    Q_OBJECT;
+
+public:
+    VBoxSearchField (QWidget *aParent = 0);
+};
+
+#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
+
+/* VBox includes */
+#include "QIToolButton.h"
+
+/* Qt includes */
+#include <QLineEdit>
+
+/* Qt forward declarations */
+class QSignalMapper;
+
+/********************************************************************************
+ *
+ * A mini cancel button for the other OS's.
+ *
+ ********************************************************************************/
+class VBoxMiniCancelButton: public QIWithRetranslateUI<QIToolButton>
+{
+    Q_OBJECT;
+
+public:
+    VBoxMiniCancelButton (QWidget *aParent = 0);
+
+protected:
+    void retranslateUi() {};
+};
+
+/********************************************************************************
+ *
+ * A help button for the other OS's.
+ *
+ ********************************************************************************/
+class VBoxHelpButton: public QIWithRetranslateUI<QPushButton>
+{
+    Q_OBJECT;
+
+public:
+    VBoxHelpButton (QWidget *aParent = 0);
+#ifdef Q_WS_MAC
+    ~VBoxHelpButton();
+    QSize sizeHint() const;
+#endif /* Q_WS_MAC */
 
     void initFrom (QPushButton *aOther);
 
+protected:
+    void retranslateUi();
+
 #ifdef Q_WS_MAC
-    ~QIHelpButton();
-
-    QSize sizeHint() const;
-
-protected:
+    void paintEvent (QPaintEvent *aEvent);
 
     bool hitButton (const QPoint &pos) const;
@@ -52 +164 @@
     void leaveEvent (QEvent *aEvent);
 
-    void paintEvent (QPaintEvent *aEvent);
-#endif /* Q_WS_MAC */
-
-protected:
-
-    void retranslateUi();
-
-private:
-    
-#ifdef Q_WS_MAC
+private:
     /* Private member vars */
     bool mButtonPressed;
@@ -73 +176 @@
 };
 
-#endif /* __QIHelpButton_h_ */
-
+/********************************************************************************
+ *
+ * A segmented button for the other OS's.
+ *
+ ********************************************************************************/
+class VBoxSegmentedButton: public QWidget
+{
+    Q_OBJECT;
+
+public:
+    VBoxSegmentedButton (int aCount, QWidget *aParent = 0);
+    ~VBoxSegmentedButton();
+
+    void setTitle (int aSegment, const QString &aTitle);
+    void setToolTip (int aSegment, const QString &aTip);
+    void setIcon (int aSegment, const QIcon &aIcon);
+    void setEnabled (int aSegment, bool fEnabled);
+
+    void animateClick (int aSegment);
+
+signals:
+    void clicked (int aSegment);
+
+private:
+    /* Private member vars */
+    QList<QIToolButton*> mButtons;
+    QSignalMapper *mSignalMapper;
+};
+
+/********************************************************************************
+ *
+ * A search field  for the other OS's.
+ *
+ ********************************************************************************/
+class VBoxSearchField: public QLineEdit
+{
+    Q_OBJECT;
+
+public:
+    VBoxSearchField (QWidget *aParent = 0);
+
+    void markError();
+    void unmarkError();
+
+private:
+    /* Private member vars */
+    QBrush mBaseBrush;
+};
+
+#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
+
+#endif /* ___VBoxSpecialControls_h__ */
+

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

@@ -41 +41 @@
 
 # include <qglobal.h> /* for QT_MAC_USE_COCOA */
-# include <QRect>
 
 # include <ApplicationServices/ApplicationServices.h>
@@ -62 +61 @@
 
 #include <iprt/cdefs.h> /* for RT_C_DECLS_BEGIN/RT_C_DECLS_END & stuff */
+#include <QRect>
 
 RT_C_DECLS_BEGIN
@@ -93 +93 @@
 void darwinWindowInvalidateShadowImpl (NativeWindowRef aWindow);
 int  darwinWindowToolBarHeight (NativeWindowRef aWindow);
+float darwinSmallFontSize();
 
 RT_C_DECLS_END
-
-#ifndef __OBJC__
-/********************************************************************************
- *
- * Window/View management (Qt Wrapper)
- *
- ********************************************************************************/
-
-/**
- * Returns a reference to the native View of the QWidget.
- *
- * @returns either HIViewRef or NSView* of the QWidget.
- * @param   aWidget   Pointer to the QWidget
- */
-NativeViewRef darwinToNativeView (QWidget *aWidget);
-
-/**
- * Returns a reference to the native Window of the QWidget.
- *
- * @returns either WindowRef or NSWindow* of the QWidget.
- * @param   aWidget   Pointer to the QWidget
- */
-NativeWindowRef darwinToNativeWindow (QWidget *aWidget);
-
-/* This is necessary because of the C calling convention. Its a simple wrapper
-   for darwinToNativeWindowImpl to allow operator overloading which isn't
-   allowed in C. */
-/**
- * Returns a reference to the native Window of the View..
- *
- * @returns either WindowRef or NSWindow* of the View.
- * @param   aWidget   Pointer to the native View
- */
-NativeWindowRef darwinToNativeWindow (NativeViewRef aView);
-
-/**
- * Returns a reference to the native View of the Window.
- *
- * @returns either HIViewRef or NSView* of the Window.
- * @param   aWidget   Pointer to the native Window
- */
-NativeViewRef darwinToNativeView (NativeWindowRef aWindow);
-
-/********************************************************************************
- *
- * Simple setter methods (Qt Wrapper)
- *
- ********************************************************************************/
-void darwinSetShowsToolbarButton (QToolBar *aToolBar, bool aEnabled);
-void darwinSetShowsResizeIndicator (QWidget *aWidget, bool aEnabled);
-void darwinSetHidesAllTitleButtons (QWidget *aWidget);
-void darwinSetShowsWindowTransparent (QWidget *aWidget, bool aEnabled);
-void darwinDisableIconsInMenus (void);
-
-/********************************************************************************
- *
- * Simple helper methods (Qt Wrapper)
- *
- ********************************************************************************/
-void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
-void darwinWindowInvalidateShape (QWidget *aWidget);
-void darwinWindowInvalidateShadow (QWidget *aWidget);
-int  darwinWindowToolBarHeight (QWidget *aWidget);
-QString darwinSystemLanguage (void);
-QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
-
-
-/********************************************************************************
- *
- * Graphics stuff (Qt Wrapper)
- *
- ********************************************************************************/
-/**
- * Returns a reference to the CGContext of the QWidget.
- *
- * @returns CGContextRef of the QWidget.
- * @param   aWidget      Pointer to the QWidget
- */
-CGContextRef darwinToCGContextRef (QWidget *aWidget);
-
-CGImageRef darwinToCGImageRef (const QImage *aImage);
-CGImageRef darwinToCGImageRef (const QPixmap *aPixmap);
-CGImageRef darwinToCGImageRef (const char *aSource);
 
 DECLINLINE(CGRect) darwinToCGRect (const QRect& aRect) { return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height()); }
@@ -188 +106 @@
     return aRect;
 }
+
+
+#ifndef __OBJC__
+/********************************************************************************
+ *
+ * Window/View management (Qt Wrapper)
+ *
+ ********************************************************************************/
+
+/**
+ * Returns a reference to the native View of the QWidget.
+ *
+ * @returns either HIViewRef or NSView* of the QWidget.
+ * @param   aWidget   Pointer to the QWidget
+ */
+NativeViewRef darwinToNativeView (QWidget *aWidget);
+
+/**
+ * Returns a reference to the native Window of the QWidget.
+ *
+ * @returns either WindowRef or NSWindow* of the QWidget.
+ * @param   aWidget   Pointer to the QWidget
+ */
+NativeWindowRef darwinToNativeWindow (QWidget *aWidget);
+
+/* This is necessary because of the C calling convention. Its a simple wrapper
+   for darwinToNativeWindowImpl to allow operator overloading which isn't
+   allowed in C. */
+/**
+ * Returns a reference to the native Window of the View..
+ *
+ * @returns either WindowRef or NSWindow* of the View.
+ * @param   aWidget   Pointer to the native View
+ */
+NativeWindowRef darwinToNativeWindow (NativeViewRef aView);
+
+/**
+ * Returns a reference to the native View of the Window.
+ *
+ * @returns either HIViewRef or NSView* of the Window.
+ * @param   aWidget   Pointer to the native Window
+ */
+NativeViewRef darwinToNativeView (NativeWindowRef aWindow);
+
+/********************************************************************************
+ *
+ * Simple setter methods (Qt Wrapper)
+ *
+ ********************************************************************************/
+void darwinSetShowsToolbarButton (QToolBar *aToolBar, bool aEnabled);
+void darwinSetShowsResizeIndicator (QWidget *aWidget, bool aEnabled);
+void darwinSetHidesAllTitleButtons (QWidget *aWidget);
+void darwinSetShowsWindowTransparent (QWidget *aWidget, bool aEnabled);
+void darwinDisableIconsInMenus (void);
+
+/********************************************************************************
+ *
+ * Simple helper methods (Qt Wrapper)
+ *
+ ********************************************************************************/
+void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
+void darwinWindowInvalidateShape (QWidget *aWidget);
+void darwinWindowInvalidateShadow (QWidget *aWidget);
+int  darwinWindowToolBarHeight (QWidget *aWidget);
+QString darwinSystemLanguage (void);
+QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
+
+
+/********************************************************************************
+ *
+ * Graphics stuff (Qt Wrapper)
+ *
+ ********************************************************************************/
+/**
+ * Returns a reference to the CGContext of the QWidget.
+ *
+ * @returns CGContextRef of the QWidget.
+ * @param   aWidget      Pointer to the QWidget
+ */
+CGContextRef darwinToCGContextRef (QWidget *aWidget);
+
+CGImageRef darwinToCGImageRef (const QImage *aImage);
+CGImageRef darwinToCGImageRef (const QPixmap *aPixmap);
+CGImageRef darwinToCGImageRef (const char *aSource);
 
 

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

@@ -32 +32 @@
 class QTabWidget;
 class QTextEdit;
-class QLineEdit;
+class VBoxSearchField;
 class QLabel;
 class QIToolButton;
+class VBoxMiniCancelButton;
+class VBoxSegmentedButton;
 class QCheckBox;
 
@@ -104 +106 @@
 private slots:
 
+    void find (int aButton);
     void findNext() { search (true); }
     void findBack() { search (false); }
@@ -120 +123 @@
     void toggleWarning (bool aHide);
 
-    VBoxVMLogViewer *mViewer;
-    QIToolButton    *mButtonClose;
-    QLabel          *mSearchName;
-    QLineEdit       *mSearchString;
-    QIToolButton    *mButtonPrev;
-    QIToolButton    *mButtonNext;
-    QCheckBox       *mCaseSensitive;
-    QSpacerItem     *mWarningSpacer;
-    QLabel          *mWarningIcon;
-    QLabel          *mWarningString;
+    VBoxVMLogViewer      *mViewer;
+    VBoxMiniCancelButton *mButtonClose;
+    QLabel               *mSearchName;
+    VBoxSearchField      *mSearchString;
+    VBoxSegmentedButton  *mButtonsNextPrev;
+    QCheckBox            *mCaseSensitive;
+    QSpacerItem          *mWarningSpacer;
+    QLabel               *mWarningIcon;
+    QLabel               *mWarningString;
 };
 

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

@@ -22 +22 @@
 
 #include "QIDialogButtonBox.h"
-#include "QIHelpButton.h"
+#include "VBoxSpecialControls.h"
 
 #include <iprt/assert.h>
@@ -114 +114 @@
         /* Use our very own help button if the user requested for one. */
         if (!mHelpButton)
-            mHelpButton = new QIHelpButton;
+            mHelpButton = new VBoxHelpButton;
         mHelpButton->initFrom (btn);
         removeButton (btn);

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

@@ -1 @@
-/** @file
- *
- * VBox frontends: Qt GUI ("VirtualBox"):
- * QIHelpButton class implementation
- */
-
-/*
- * Copyright (C) 2008 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
- */
-
-#include "QIHelpButton.h"
+/* VBox includes */
+#include "VBoxSpecialControls.h"
+
+/* VBox includes */
+#include "VBoxGlobal.h"
+
+#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
+
+/********************************************************************************
+ *
+ * A mini cancel button in the native Cocoa version.
+ *
+ ********************************************************************************/
+VBoxMiniCancelButton::VBoxMiniCancelButton (QWidget *aParent /* = 0 */)
+  : QAbstractButton (aParent)
+{
+    setShortcut (QKeySequence (Qt::Key_Escape));
+    mButton = new VBoxCocoaButton (VBoxCocoaButton::CancelButton, this);
+    connect (mButton, SIGNAL (clicked()),
+             this, SIGNAL (clicked()));
+    setFixedSize (mButton->size());
+}
+
+/********************************************************************************
+ *
+ * A help button in the native Cocoa version.
+ *
+ ********************************************************************************/
+VBoxHelpButton::VBoxHelpButton (QWidget *aParent /* = 0 */)
+  : QPushButton (aParent)
+{
+    setShortcut (QKeySequence (QKeySequence::HelpContents));
+    mButton = new VBoxCocoaButton (VBoxCocoaButton::HelpButton, this);
+    connect (mButton, SIGNAL (clicked()),
+             this, SIGNAL (clicked()));
+    setFixedSize (mButton->size());
+}
+
+/********************************************************************************
+ *
+ * A segmented button in the native Cocoa version.
+ *
+ ********************************************************************************/
+VBoxSegmentedButton::VBoxSegmentedButton (int aCount, QWidget *aParent /* = 0 */)
+  : VBoxCocoaSegmentedButton (aCount, aParent)
+{
+}
+/********************************************************************************
+ *
+ * A search field in the native Cocoa version.
+ *
+ ********************************************************************************/
+VBoxSearchField::VBoxSearchField (QWidget *aParent /* = 0 */)
+  : VBoxCocoaSearchField (aParent)
+{
+}
+
+#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
 
 /* Qt includes */
@@ -27 +62 @@
 #include <QBitmap>
 #include <QMouseEvent>
-
+#include <QSignalMapper>
+
+/********************************************************************************
+ *
+ * A mini cancel button for the other OS's.
+ *
+ ********************************************************************************/
+VBoxMiniCancelButton::VBoxMiniCancelButton (QWidget *aParent /* = 0 */)
+  : QIWithRetranslateUI<QIToolButton> (aParent)
+{
+    setAutoRaise (true);
+    setFocusPolicy (Qt::TabFocus);
+    setShortcut (QKeySequence (Qt::Key_Escape));
+    setIcon (VBoxGlobal::iconSet (":/delete_16px.png",
+                                  ":/delete_dis_16px.png"));
+}
+
+/********************************************************************************
+ *
+ * A help button for the other OS's.
+ *
+ ********************************************************************************/
 /* From: src/gui/styles/qmacstyle_mac.cpp */
 static const int PushButtonLeftOffset = 6;
@@ -34 +90 @@
 static const int PushButtonBottomOffset = 4;
 
-QIHelpButton::QIHelpButton(QWidget *aParent /* = NULL */)
+VBoxHelpButton::VBoxHelpButton (QWidget *aParent /* = 0 */)
     : QIWithRetranslateUI<QPushButton> (aParent)
 {
@@ -43 +99 @@
     mSize = mNormalPixmap->size();
     mMask = new QImage (mNormalPixmap->mask().toImage());
-    mBRect = QRect (PushButtonLeftOffset, 
+    mBRect = QRect (PushButtonLeftOffset,
                     PushButtonTopOffset,
                     mSize.width(),
@@ -52 +108 @@
 }
 
-void QIHelpButton::initFrom (QPushButton *aOther)
+void VBoxHelpButton::initFrom (QPushButton *aOther)
 {
     setIcon (aOther->icon());
@@ -64 +120 @@
 }
 
+void VBoxHelpButton::retranslateUi()
+{
+    QPushButton::setText (tr ("&Help"));
+    if (QPushButton::shortcut().isEmpty())
+        QPushButton::setShortcut (QKeySequence::HelpContents);
+}
+
 #ifdef Q_WS_MAC
-QIHelpButton::~QIHelpButton()
+VBoxHelpButton::~VBoxHelpButton()
 {
     delete mNormalPixmap;
@@ -72 +135 @@
 }
 
-QSize QIHelpButton::sizeHint() const
+QSize VBoxHelpButton::sizeHint() const
 {
     return QSize (mSize.width() + PushButtonLeftOffset + PushButtonRightOffset,
@@ -78 +141 @@
 }
 
-bool QIHelpButton::hitButton (const QPoint &pos) const
+void VBoxHelpButton::paintEvent (QPaintEvent * /* aEvent */)
+{
+    QPainter painter (this);
+    painter.drawPixmap (PushButtonLeftOffset, PushButtonTopOffset, mButtonPressed ? *mPressedPixmap: *mNormalPixmap);
+}
+
+bool VBoxHelpButton::hitButton (const QPoint &pos) const
 {
     if (mBRect.contains (pos))
@@ -87 +156 @@
 }
 
-void QIHelpButton::mousePressEvent (QMouseEvent *aEvent) 
+void VBoxHelpButton::mousePressEvent (QMouseEvent *aEvent)
 {
     if (hitButton (aEvent->pos()))
@@ -95 +164 @@
 }
 
-void QIHelpButton::mouseReleaseEvent (QMouseEvent *aEvent) 
+void VBoxHelpButton::mouseReleaseEvent (QMouseEvent *aEvent)
 {
     QPushButton::mouseReleaseEvent (aEvent);
@@ -102 +171 @@
 }
 
-void QIHelpButton::leaveEvent (QEvent * aEvent)
+void VBoxHelpButton::leaveEvent (QEvent * aEvent)
 {
     QPushButton::leaveEvent (aEvent);
@@ -108 +177 @@
     update();
 }
-
-void QIHelpButton::paintEvent (QPaintEvent * /* aEvent */)
-{
-    QPainter painter (this);
-    painter.drawPixmap (PushButtonLeftOffset, PushButtonTopOffset, mButtonPressed ? *mPressedPixmap: *mNormalPixmap);
-}
 #endif /* Q_WS_MAC */
 
-void QIHelpButton::retranslateUi()
-{
-    QPushButton::setText (tr ("&Help"));
-    if (QPushButton::shortcut().isEmpty())
-        QPushButton::setShortcut (QKeySequence::HelpContents); 
-}
-
+/********************************************************************************
+ *
+ * A segmented button for the other OS's.
+ *
+ ********************************************************************************/
+VBoxSegmentedButton::VBoxSegmentedButton (int aCount, QWidget *aParent /* = 0 */)
+  : QWidget (aParent)
+{
+    mSignalMapper = new QSignalMapper (this);
+
+    QHBoxLayout *layout = new QHBoxLayout (this);
+    for (int i=0; i < aCount; ++i)
+    {
+        QIToolButton *button = new QIToolButton (this);
+        button->setAutoRaise (true);
+        button->setFocusPolicy (Qt::TabFocus);
+        button->setToolButtonStyle (Qt::ToolButtonTextBesideIcon);
+        mButtons.append (button);
+        layout->addWidget (button);
+        connect (button, SIGNAL(clicked()),
+                 mSignalMapper, SLOT(map()));
+        mSignalMapper->setMapping (button, i);
+    }
+    connect (mSignalMapper, SIGNAL(mapped(int)),
+             this, SIGNAL(clicked(int)));
+
+}
+
+VBoxSegmentedButton::~VBoxSegmentedButton()
+{
+    delete mSignalMapper;
+    qDeleteAll (mButtons);
+}
+
+void VBoxSegmentedButton::setTitle (int aSegment, const QString &aTitle)
+{
+    mButtons.at (aSegment)->setText (aTitle);
+}
+
+void VBoxSegmentedButton::setToolTip (int aSegment, const QString &aTip)
+{
+    mButtons.at (aSegment)->setToolTip (aTip);
+}
+
+void VBoxSegmentedButton::setIcon (int aSegment, const QIcon &aIcon)
+{
+    mButtons.at (aSegment)->setIcon (aIcon);
+}
+
+void VBoxSegmentedButton::setEnabled (int aSegment, bool fEnabled)
+{
+    mButtons.at (aSegment)->setEnabled (fEnabled);
+}
+
+void VBoxSegmentedButton::animateClick (int aSegment)
+{
+    mButtons.at (aSegment)->animateClick();
+}
+
+/********************************************************************************
+ *
+ * A search field  for the other OS's.
+ *
+ ********************************************************************************/
+VBoxSearchField::VBoxSearchField (QWidget *aParent /* = 0 */)
+  : QLineEdit (aParent)
+{
+    mBaseBrush = palette().base();
+}
+
+void VBoxSearchField::markError()
+{
+    QPalette pal = palette();
+    QColor c (Qt::red);
+    c.setAlphaF (0.3);
+    pal.setBrush (QPalette::Base, c);
+    setPalette (pal);
+}
+
+void VBoxSearchField::unmarkError()
+{
+    QPalette pal = palette();
+    pal.setBrush (QPalette::Base, mBaseBrush);
+    setPalette (pal);
+}
+
+#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
+

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

@@ -21 +21 @@
  */
 
-#include <VBoxVMLogViewer.h>
-#include <VBoxGlobal.h>
-#include <VBoxProblemReporter.h>
-#include "QIToolButton.h"
+#include "VBoxVMLogViewer.h"
+#include "VBoxGlobal.h"
+#include "VBoxProblemReporter.h"
+#include "VBoxSpecialControls.h"
+#include "VBoxUtils.h"
 
 /* Qt includes */
@@ -121 +122 @@
     /* We have to force this to get the default button L&F on the mac. */
     defaultButton()->setEnabled (true);
+# ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
+    logsFrameLayout->setSpacing (4);
+# endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
 #endif /* Q_WS_MAC */
     /* Loading language constants */
@@ -339 +343 @@
     , mButtonClose (0)
     , mSearchName (0), mSearchString (0)
-    , mButtonPrev (0), mButtonNext (0)
+    , mButtonsNextPrev (0)
     , mCaseSensitive (0)
     , mWarningSpacer (0), mWarningIcon (0), mWarningString (0)
 {
-    mButtonClose = new QIToolButton (this);
-    mButtonClose->setAutoRaise (true);
-    mButtonClose->setFocusPolicy (Qt::TabFocus);
-    mButtonClose->setShortcut (QKeySequence (Qt::Key_Escape));
+    mButtonClose = new VBoxMiniCancelButton (this);
     connect (mButtonClose, SIGNAL (clicked()), this, SLOT (hide()));
-    mButtonClose->setIcon (VBoxGlobal::iconSet (":/delete_16px.png",
-                                                ":/delete_dis_16px.png"));
 
     mSearchName = new QLabel (this);
-    mSearchString = new QLineEdit (this);
+    mSearchString = new VBoxSearchField (this);
     mSearchString->setSizePolicy (QSizePolicy::Preferred,
                                   QSizePolicy::Fixed);
@@ -358 +357 @@
              this, SLOT (findCurrent (const QString &)));
 
-    mButtonNext = new QIToolButton (this);
-    mButtonNext->setEnabled (false);
-    mButtonNext->setAutoRaise (true);
-    mButtonNext->setFocusPolicy (Qt::TabFocus);
-    mButtonNext->setToolButtonStyle (Qt::ToolButtonTextBesideIcon);
-    connect (mButtonNext, SIGNAL (clicked()), this, SLOT (findNext()));
-    mButtonNext->setIcon (VBoxGlobal::iconSet (":/list_movedown_16px.png",
-                                               ":/list_movedown_disabled_16px.png"));
-
-    mButtonPrev = new QIToolButton (this);
-    mButtonPrev->setEnabled (false);
-    mButtonPrev->setAutoRaise (true);
-    mButtonPrev->setFocusPolicy (Qt::TabFocus);
-    mButtonPrev->setToolButtonStyle (Qt::ToolButtonTextBesideIcon);
-    connect (mButtonPrev, SIGNAL (clicked()), this, SLOT (findBack()));
-    mButtonPrev->setIcon (VBoxGlobal::iconSet (":/list_moveup_16px.png",
-                                               ":/list_moveup_disabled_16px.png"));
+    mButtonsNextPrev = new VBoxSegmentedButton (2, this);
+    mButtonsNextPrev->setEnabled (0, false);
+    mButtonsNextPrev->setIcon (0, VBoxGlobal::iconSet (":/list_movedown_16px.png",
+                                                       ":/list_movedown_disabled_16px.png"));
+    mButtonsNextPrev->setEnabled (1, false);
+    mButtonsNextPrev->setIcon (1, VBoxGlobal::iconSet (":/list_moveup_16px.png",
+                                                       ":/list_moveup_disabled_16px.png"));
+    connect (mButtonsNextPrev, SIGNAL (clicked (int)), this, SLOT (find (int)));
 
     mCaseSensitive = new QCheckBox (this);
@@ -391 +381 @@
     QSpacerItem *spacer = new QSpacerItem (0, 0, QSizePolicy::Expanding,
                                                  QSizePolicy::Minimum);
+
+#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS
+    QFont font = mSearchName->font();
+    font.setPointSize (::darwinSmallFontSize());
+    mSearchName->setFont (font);
+    mCaseSensitive->setFont (font);
+    mWarningString->setFont (font);
+#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */
 
     QHBoxLayout *mainLayout = new QHBoxLayout (this);
@@ -398 +396 @@
     mainLayout->addWidget (mSearchName);
     mainLayout->addWidget (mSearchString);
-    mainLayout->addWidget (mButtonNext);
-    mainLayout->addWidget (mButtonPrev);
+    mainLayout->addWidget (mButtonsNextPrev);
     mainLayout->addWidget (mCaseSensitive);
     mainLayout->addItem   (mWarningSpacer);
@@ -419 +416 @@
     mSearchString->setToolTip (tr ("Enter a search string here"));
 
-    VBoxGlobal::setTextLabel (mButtonPrev, tr ("&Previous"));
-    mButtonPrev->setToolTip (tr ("Search for the previous occurrence "
-                                 "of the string"));
-
-    VBoxGlobal::setTextLabel (mButtonNext, tr ("&Next"));
-    mButtonNext->setToolTip (tr ("Search for the next occurrence of "
-                                 "the string"));
+    mButtonsNextPrev->setTitle (0, tr ("&Next"));
+    mButtonsNextPrev->setToolTip (0, tr ("Search for the previous occurrence "
+                                         "of the string"));
+
+    mButtonsNextPrev->setTitle (1, tr ("&Previous"));
+    mButtonsNextPrev->setToolTip (1, tr ("Search for the next occurrence of "
+                                         "the string"));
+
 
     mCaseSensitive->setText (tr ("C&ase Sensitive"));
@@ -436 +434 @@
 void VBoxLogSearchPanel::findCurrent (const QString &aSearchString)
 {
-    mButtonNext->setEnabled (aSearchString.length());
-    mButtonPrev->setEnabled (aSearchString.length());
+    mButtonsNextPrev->setEnabled (0, aSearchString.length());
+    mButtonsNextPrev->setEnabled (1, aSearchString.length());
     toggleWarning (!aSearchString.length());
     if (aSearchString.length())
@@ -507 +505 @@
                 (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return))
             {
-                mButtonNext->animateClick();
+                mButtonsNextPrev->animateClick (0);
                 return true;
             }
@@ -514 +512 @@
             {
                 if (e->QInputEvent::modifiers() == 0)
-                    mButtonNext->animateClick();
+                    mButtonsNextPrev->animateClick (0);
                 else if (e->QInputEvent::modifiers() == Qt::ShiftModifier)
-                    mButtonPrev->animateClick();
+                    mButtonsNextPrev->animateClick (1);
                 return true;
             }
@@ -573 +571 @@
     mWarningSpacer->changeSize (aHide ? 0 : 16, 0, QSizePolicy::Fixed,
                                                    QSizePolicy::Minimum);
+    if (!aHide)
+        mSearchString->markError();
+    else
+        mSearchString->unmarkError();
     mWarningIcon->setHidden (aHide);
     mWarningString->setHidden (aHide);
 }
 
+void VBoxLogSearchPanel::find (int aButton)
+{
+    if (aButton == 0)
+        findNext();
+    else
+        findBack();
+}

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin-cocoa.mm

@@ -28 +28 @@
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSColor.h>
+#import <AppKit/NSFont.h>
 
 NativeWindowRef darwinToNativeWindowImpl (NativeViewRef aView)
@@ -36 +37 @@
     if (aView)
         window = [aView window];
-
+    
     [pool release];
     return window;
@@ -47 +48 @@
     NativeViewRef view = NULL;
     if (aWindow)
-        view = [aWindow contentView];
+        view = [aWindow contentView];   
 
     [pool release];
@@ -156 +157 @@
 }
 
+int darwinWindowToolBarHeight (NativeWindowRef aWindow)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    NSToolbar *toolbar = [aWindow toolbar];
+    NSRect windowFrame = [aWindow frame];
+    int toolbarHeight = 0;
+    int theight = (NSHeight([NSWindow contentRectForFrameRect:[aWindow frame] styleMask:[aWindow styleMask]]) - NSHeight([[aWindow contentView] frame]));
+    /* toolbar height: */
+    if(toolbar && [toolbar isVisible])
+        /* title bar height: */
+        toolbarHeight = NSHeight (windowFrame) - NSHeight ([[aWindow contentView] frame]) - theight;
+
+    [pool release];
+    return toolbarHeight;
+}
+
+float darwinSmallFontSize()
+{
+    return [NSFont systemFontSizeForControlSize: NSSmallControlSize];
+}
+