Changeset 27401 in vbox

Timestamp:

Mar 16, 2010 1:16:47 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58863

Message:

FE/Qt4: use the specialized cancel button in the additions downloader view

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• darwin/VBoxCocoaSpecialControls.h (modified) (1 diff)
• darwin/VBoxCocoaSpecialControls.mm (modified) (3 diffs)
• widgets/UIDownloader.cpp (modified) (3 diffs)
• widgets/UIDownloader.h (modified) (2 diffs)
• widgets/VBoxSpecialControls.cpp (modified) (2 diffs)
• widgets/VBoxSpecialControls.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaSpecialControls.h

@@ -56 +56 @@
 signals:
     void clicked (bool checked = false);
+
+protected:
+    void resizeEvent(QResizeEvent *pEvent);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxCocoaSpecialControls.mm

@@ +1 @@
+/* $Id$ */
 /** @file
  *
@@ -204 +205 @@
   : QMacCocoaViewContainer (0, aParent)
 {
+    setContentsMargins(0, 0, 0, 0);
     switch (aType)
     {
@@ -250 +252 @@
 }
 
+void VBoxCocoaButton::resizeEvent(QResizeEvent * /* pEvent */)
+{
+    NSRect frame = [mNativeRef frame];
+    frame.size.width = width();
+    frame.size.height = height();
+    [mNativeRef setFrame:frame];
+}
+
 void VBoxCocoaButton::setText (const QString& aText)
 {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp

@@ -27 +27 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
+#include "VBoxSpecialControls.h"
 
 /* Global includes */
@@ -35 +36 @@
     : QWidget(pParent)
     , m_pProgressBar(new QProgressBar(this))
-    , m_pCancelButton(new QToolButton(this))
+    , m_pCancelButton(new VBoxMiniCancelButton(this))
 {
     /* Progress Bar setup */
@@ -43 +44 @@
 
     /* Cancel Button setup */
-    m_pCancelButton->setAutoRaise(true);
     m_pCancelButton->setFocusPolicy(Qt::TabFocus);
+    m_pCancelButton->removeBorder();
     connect(m_pCancelButton, SIGNAL(clicked()),
             this, SIGNAL(sigCancel()));
 
+    setContentsMargins(0, 0, 0, 0);
+    setFixedHeight(16);
+
     /* Layout setup */
-    setFixedHeight(16);
     QHBoxLayout *pMainLayout = new QHBoxLayout(this);
+    VBoxGlobal::setLayoutMargin(pMainLayout, 0);
+
+#ifdef Q_WS_MAC
+    pMainLayout->setSpacing(2);
+    m_pProgressBar->setFixedHeight(14);
+    m_pCancelButton->setFixedHeight(11);
+    pMainLayout->addWidget(m_pProgressBar, 0, Qt::AlignTop);
+    pMainLayout->addWidget(m_pCancelButton, 0, Qt::AlignBottom);
+#else /* Q_WS_MAC */
     pMainLayout->setSpacing(0);
-    VBoxGlobal::setLayoutMargin(pMainLayout, 0);
-    pMainLayout->addWidget(m_pProgressBar);
-    pMainLayout->addWidget(m_pCancelButton);
+    pMainLayout->addWidget(m_pProgressBar, 0, Qt::AlignCenter);
+    pMainLayout->addWidget(m_pCancelButton, 0, Qt::AlignCenter);
+#endif /* !Q_WS_MAC */
+
     pMainLayout->addStretch(1);
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.h

@@ -28 +28 @@
 #include <QWidget>
 
+/* Local forward declarations */
+class QIHttp;
+class VBoxMiniCancelButton;
+
 /* Global forward declarations */
-class QIHttp;
 class QHttpResponseHeader;
 class QProgressBar;
-class QToolButton;
 
 class UIMiniProcessWidget : public QWidget
@@ -66 +68 @@
     /* Private member vars */
     QProgressBar *m_pProgressBar;
-    QToolButton *m_pCancelButton;
+    VBoxMiniCancelButton *m_pCancelButton;
+
     QString m_strSource;
 };

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

@@ -43 +43 @@
              this, SIGNAL (clicked()));
     setFixedSize (mButton->size());
+}
+
+void VBoxMiniCancelButton::resizeEvent(QResizeEvent * /* pEvent */)
+{
+    mButton->resize(size());
 }
 
@@ -103 +108 @@
                                           ":/delete_dis_16px.png");
     setIcon (cancelIcon);
+}
+
+void VBoxMiniCancelButton::removeBorder()
+{
+    setStyleSheet("QToolButton { border: 0px }");
 }
 

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

@@ -49 +49 @@
     void setText (const QString &aText) { mButton->setText (aText); }
     void setToolTip (const QString &aTip) { mButton->setToolTip (aTip); }
+    void removeBorder() {}
 
 protected:
     void paintEvent (QPaintEvent * /* aEvent */) {}
+    void resizeEvent(QResizeEvent *pEvent);
 
 private:
@@ -130 +132 @@
 public:
     VBoxMiniCancelButton (QWidget *aParent = 0);
+    void removeBorder();
 
 protected: