Changeset 8568 in vbox

Timestamp:

May 5, 2008 12:24:08 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Added extra base classes for the styling of the ListView in Leopard.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (2 diffs)
• include/QIListView.h (added)
• include/VBoxVMListView.h (modified) (5 diffs)
• src/QIListView.cpp (added)
• src/VBoxVMListView.cpp (modified) (5 diffs)

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

@@ -413 +413 @@
         include/QIAbstractWizard.h \
         include/QIAbstractDialog.h \
+        include/QIListView.h \
         include/VBoxGlobalSettings.h \
         include/VBoxUtils.h \
@@ -490 +491 @@
         src/QIAbstractDialog.cpp \
         src/QIDialog.cpp \
+        src/QIListView.cpp \
         src/VBoxDefs.cpp \
         src/VBoxGlobalSettings.cpp \

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

@@ -25 +25 @@
 
 #include "VBoxGlobal.h"
-#include "VBoxDefs.h"
+#include "QIListView.h"
 
 /* Qt includes */
 #include <QAbstractListModel>
-#include <QListView>
-#include <QItemDelegate>
 #include <QDateTime>
 
@@ -138 +136 @@
 };
 
-class VBoxVMListView: public QListView
+class VBoxVMListView: public QIListView
 {
     Q_OBJECT;
@@ -161 +159 @@
     void currentChanged (const QModelIndex &aCurrent, const QModelIndex &aPrevious);
     void dataChanged (const QModelIndex &aTopLeft, const QModelIndex &aBottomRight);
-    void focusChanged (QWidget *aOld, QWidget *aNow);
 
 protected:
@@ -168 +165 @@
 }; 
 
-class VBoxVMItemPainter: public QItemDelegate
+class VBoxVMItemPainter: public QIItemDelegate
 {
 public:
     VBoxVMItemPainter (QObject *aParent = 0)
-      : QItemDelegate (aParent), mMargin (8), mSpacing (mMargin * 3 / 2) {}
+      : QIItemDelegate (aParent), mMargin (8), mSpacing (mMargin * 3 / 2) {}
 
     QSize sizeHint (const QStyleOptionViewItem &aOption,
@@ -179 +176 @@
     void paint (QPainter *aPainter, const QStyleOptionViewItem &aOption,
                 const QModelIndex &aIndex) const;
-
-protected:
-    void drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 
-                         const QModelIndex &aIndex) const;
 
 private:

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

@@ -30 +30 @@
 #if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
-# if MAC_LEOPARD_STYLE
-#  include <qmacstyle_mac.h>
-# endif /* MAC_LEOPARD_STYLE */
 #endif
 
@@ -612 +609 @@
 
 VBoxVMListView::VBoxVMListView (QWidget *aParent /* = 0 */)
-    :QListView (aParent)
+    :QIListView (aParent)
 {
     /* Create & set our delegation class */
@@ -622 +619 @@
     connect (this, SIGNAL (activated (const QModelIndex &)),
              this, SIGNAL (activated ()));
-    /* Track if the application lost the focus */
-#if MAC_LEOPARD_STYLE
-    connect (QCoreApplication::instance(), SIGNAL (focusChanged (QWidget *, QWidget *)),
-             this, SLOT (focusChanged (QWidget *, QWidget *)));
-    /* 1 pixel line frame */
-    setMidLineWidth (1);
-    setLineWidth (0);
-    setFrameShape (QFrame::Box);
-    focusChanged (NULL, this);
-    /* Nesty hack to disable the focus rect on the list view. This interface
-     * may change at any time! */
-    static_cast<QMacStyle *> (style())->setFocusRectPolicy (this, QMacStyle::FocusDisabled);
-#endif /* MAC_LEOPARD_STYLE */
 }
 
@@ -700 +684 @@
     ensureCurrentVisible();
     emit currentChanged(); 
-}
-
-void VBoxVMListView::focusChanged (QWidget * /* aOld */, QWidget *aNow)
-{
-#if MAC_LEOPARD_STYLE
-    QColor bgColor (212, 221, 229);
-    if (aNow == NULL)
-        bgColor.setRgb (232, 232, 232);
-    QPalette pal = viewport()->palette();
-    pal.setColor (QPalette::Base, bgColor);
-    viewport()->setPalette (pal);
-    viewport()->setAutoFillBackground (true);
-#else /* MAC_LEOPARD_STYLE */
-    NOREF (aNow);
-#endif /* MAC_LEOPARD_STYLE */
 }
 
@@ -861 +830 @@
 }
 
-void VBoxVMItemPainter::drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 
-                                        const QModelIndex &aIndex) const
-{   
-#if MAC_LEOPARD_STYLE
-    NOREF (aIndex);
-    /* Macify for Leopard */
-    if (aOption.state & QStyle::State_Selected)
-    {   
-        /* Standard color for selected items and focus on the widget */
-        QColor topLineColor (69, 128, 200);
-        QColor topGradColor (92, 147, 214);
-        QColor bottomGradColor (21, 83, 169);
-        /* Color for selected items and no focus on the widget */
-        if (QWidget *p = qobject_cast<QWidget *> (parent()))
-            if (!p->hasFocus())
-            {
-                topLineColor.setRgb (145, 160, 192);
-                topGradColor.setRgb (162, 177, 207);
-                bottomGradColor.setRgb (110, 129, 169);
-            }
-        /* Color for selected items and no focus on the application at all */
-        if (qApp->focusWidget() == NULL)
-            {
-                topLineColor.setRgb (151, 151, 151);
-                topGradColor.setRgb (180, 180, 180);
-                bottomGradColor.setRgb (137, 137, 137);
-            }
-        /* Paint the background */
-        QRect r = aOption.rect;
-        r.setTop (r.top() + 1);
-        QLinearGradient linearGrad (QPointF(0, r.top()), QPointF(0, r.bottom()));
-        linearGrad.setColorAt (0, topGradColor);
-        linearGrad.setColorAt (1, bottomGradColor);
-        aPainter->setPen (topLineColor);
-        aPainter->drawLine (r.left(), r.top() - 1, r.right(), r.top() - 1);
-        aPainter->fillRect (r, linearGrad);
-    }
-#else /* MAC_LEOPARD_STYLE */
-    QItemDelegate::drawBackground (aPainter, aOption, aIndex);
-#endif /* MAC_LEOPARD_STYLE */
-}
-
 QRect VBoxVMItemPainter::rect (const QStyleOptionViewItem &aOption,
                                const QModelIndex &aIndex, int aRole) const