Changeset 30356 in vbox

Timestamp:

Jun 22, 2010 8:42:22 AM (15 years ago)

Author:

vboxsync

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

62937

Message:

FE/Qt4: added a new segmented button type; code cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (4 diffs)
• src/VBoxVMLogViewer.cpp (modified) (3 diffs)
• src/VBoxVMLogViewer.h (modified) (3 diffs)
• src/extensions/QIDialogButtonBox.cpp (modified) (2 diffs)
• src/extensions/QIDialogButtonBox.h (modified) (2 diffs)
• src/settings/global/VBoxGLSettingsInput.ui (modified) (1 diff)
• src/widgets/UIDownloader.cpp (modified) (2 diffs)
• src/widgets/UIDownloader.h (modified) (2 diffs)
• src/widgets/UISpecialControls.cpp (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.cpp ) (12 diffs)
• src/widgets/UISpecialControls.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.h ) (13 diffs)
• src/widgets/VBoxProgressDialog.cpp (modified) (2 diffs)
• src/widgets/VBoxProgressDialog.h (modified) (2 diffs)

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

@@ -306 +306 @@
         src/wizards/exportappliance/UIExportApplianceWzd.h \
         src/wizards/importappliance/UIImportApplianceWzd.h \
-        src/widgets/VBoxApplianceEditorWgt.h \
-        src/widgets/VBoxBootTable.h \
         src/widgets/UIDownloader.h \
         src/widgets/UIDownloaderAdditions.h \
         src/widgets/UIDownloaderUserManual.h \
+        src/widgets/UISpacerWidgets.h \
+        src/widgets/UISpecialControls.h \
+        src/widgets/VBoxApplianceEditorWgt.h \
+        src/widgets/VBoxBootTable.h \
         src/widgets/VBoxExportApplianceWgt.h \
         src/widgets/VBoxFilePathSelectorWidget.h \
@@ -320 +322 @@
         src/widgets/VBoxOSTypeSelectorWidget.h \
         src/widgets/VBoxProgressDialog.h \
-        src/widgets/VBoxSpecialControls.h \
         src/widgets/VBoxWarningPane.h \
-        src/widgets/UISpacerWidgets.h \
         src/runtime/UISession.h \
         src/runtime/UIActionsPool.h \
@@ -439 +439 @@
         src/wizards/exportappliance/UIExportApplianceWzd.cpp \
         src/wizards/importappliance/UIImportApplianceWzd.cpp \
-        src/widgets/VBoxApplianceEditorWgt.cpp \
-        src/widgets/VBoxBootTable.cpp \
         src/widgets/UIDownloader.cpp \
         src/widgets/UIDownloaderAdditions.cpp \
         src/widgets/UIDownloaderUserManual.cpp \
+        src/widgets/UISpecialControls.cpp \
+        src/widgets/VBoxApplianceEditorWgt.cpp \
+        src/widgets/VBoxBootTable.cpp \
         src/widgets/VBoxExportApplianceWgt.cpp \
         src/widgets/VBoxFilePathSelectorWidget.cpp \
@@ -454 +455 @@
         src/widgets/VBoxOSTypeSelectorWidget.cpp \
         src/widgets/VBoxProgressDialog.cpp \
-        src/widgets/VBoxSpecialControls.cpp \
         src/widgets/VBoxWarningPane.cpp \
         src/runtime/UISession.cpp \

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

@@ -23 +23 @@
 #include "QITabWidget.h"
 #include "UIIconPool.h"
+#include "UISpecialControls.h"
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxSpecialControls.h"
 #include "VBoxUtils.h"
 #include "VBoxVMLogViewer.h"
@@ -348 +348 @@
     , mWarningSpacer (0), mWarningIcon (0), mWarningString (0)
 {
-    mButtonClose = new VBoxMiniCancelButton (this);
+    mButtonClose = new UIMiniCancelButton (this);
     connect (mButtonClose, SIGNAL (clicked()), this, SLOT (hide()));
 
     mSearchName = new QLabel (this);
-    mSearchString = new VBoxSearchField (this);
+    mSearchString = new UISearchField (this);
     mSearchString->setSizePolicy (QSizePolicy::Preferred,
                                   QSizePolicy::Fixed);
@@ -358 +358 @@
              this, SLOT (findCurrent (const QString &)));
 
-    mButtonsNextPrev = new VBoxSegmentedButton (2, this);
+    mButtonsNextPrev = new UIRoundRectSegmentedButton(2, this);
     mButtonsNextPrev->setEnabled (0, false);
     mButtonsNextPrev->setEnabled (1, false);

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

@@ -20 +20 @@
 #define __VBoxVMLogViewer_h__
 
+/* Local includes */
 #include "VBoxVMLogViewer.gen.h"
 #include "QIMainDialog.h"
@@ -25 +26 @@
 #include "QIWithRetranslateUI.h"
 
+/* Local forward declarations */
+class QITabWidget;
+class QIToolButton;
+class UIMiniCancelButton;
+class UIRoundRectSegmentedButton;
+class UISearchField;
 class VBoxLogSearchPanel;
-class QITabWidget;
+
+/* Global forward declarations */
+class QCheckBox;
+class QLabel;
 class QTextEdit;
-class VBoxSearchField;
-class QLabel;
-class QIToolButton;
-class VBoxMiniCancelButton;
-class VBoxSegmentedButton;
-class QCheckBox;
 
 class VBoxVMLogViewer : public QIWithRetranslateUI2<QIMainDialog>,
@@ -118 +122 @@
     void toggleWarning (bool aHide);
 
-    VBoxVMLogViewer      *mViewer;
-    VBoxMiniCancelButton *mButtonClose;
-    QLabel               *mSearchName;
-    VBoxSearchField      *mSearchString;
-    VBoxSegmentedButton  *mButtonsNextPrev;
-    QCheckBox            *mCaseSensitive;
-    QSpacerItem          *mWarningSpacer;
-    QLabel               *mWarningIcon;
-    QLabel               *mWarningString;
+    VBoxVMLogViewer            *mViewer;
+    UIMiniCancelButton         *mButtonClose;
+    QLabel                     *mSearchName;
+    UISearchField              *mSearchString;
+    UIRoundRectSegmentedButton *mButtonsNextPrev;
+    QCheckBox                  *mCaseSensitive;
+    QSpacerItem                *mWarningSpacer;
+    QLabel                     *mWarningIcon;
+    QLabel                     *mWarningString;
 };
 

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

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

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

@@ -28 +28 @@
 class QBoxLayout;
 
-class VBoxHelpButton;
+class UIHelpButton;
 
 class QIDialogButtonBox: public QIWithRetranslateUI<QDialogButtonBox>
@@ -56 +56 @@
 private:
 
-    QPointer<VBoxHelpButton> mHelpButton;
+    QPointer<UIHelpButton> mHelpButton;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.ui

@@ -124 +124 @@
    <class>UIResetButton</class>
    <extends>QAbstractButton</extends>
-   <header>VBoxSpecialControls.h</header>
+   <header>UISpecialControls.h</header>
   </customwidget>
  </customwidgets>

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

@@ -23 +23 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
-#include "VBoxSpecialControls.h"
+#include "UISpecialControls.h"
 
 /* Global includes */
@@ -32 +32 @@
     : QWidget(pParent)
     , m_pProgressBar(new QProgressBar(this))
-    , m_pCancelButton(new VBoxMiniCancelButton(this))
+    , m_pCancelButton(new UIMiniCancelButton(this))
 {
     /* Progress Bar setup */

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

@@ -26 +26 @@
 /* Local forward declarations */
 class QIHttp;
-class VBoxMiniCancelButton;
+class UIMiniCancelButton;
 
 /* Global forward declarations */
@@ -64 +64 @@
     /* Private member vars */
     QProgressBar *m_pProgressBar;
-    VBoxMiniCancelButton *m_pCancelButton;
+    UIMiniCancelButton *m_pCancelButton;
 
     QString m_strSource;

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 /* VBox includes */
 #include "UIIconPool.h"
-#include "VBoxSpecialControls.h"
+#include "UISpecialControls.h"
 
 /* Global includes */
@@ -32 +32 @@
  *
  ********************************************************************************/
-VBoxMiniCancelButton::VBoxMiniCancelButton (QWidget *aParent /* = 0 */)
-  : QAbstractButton (aParent)
-{
-    setShortcut (QKeySequence (Qt::Key_Escape));
-    mButton = new UICocoaButton (UICocoaButton::CancelButton, this);
-    connect (mButton, SIGNAL (clicked()),
-             this, SIGNAL (clicked()));
-    setFixedSize (mButton->size());
-}
-
-void VBoxMiniCancelButton::resizeEvent(QResizeEvent * /* pEvent */)
-{
-    mButton->resize(size());
+UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */)
+  : QAbstractButton(pParent)
+{
+    setShortcut(QKeySequence(Qt::Key_Escape));
+    m_pButton = new UICocoaButton(UICocoaButton::CancelButton, this);
+    connect(m_pButton, SIGNAL(clicked()),
+            this, SIGNAL(clicked()));
+    setFixedSize(m_pButton->size());
+}
+
+void UIMiniCancelButton::resizeEvent(QResizeEvent * /* pEvent */)
+{
+    m_pButton->resize(size());
 }
 
@@ -71 +71 @@
  *
  ********************************************************************************/
-VBoxHelpButton::VBoxHelpButton (QWidget *aParent /* = 0 */)
-  : QPushButton (aParent)
-{
-    setShortcut (QKeySequence (QKeySequence::HelpContents));
-    mButton = new UICocoaButton (UICocoaButton::HelpButton, this);
-    connect (mButton, SIGNAL (clicked()),
-             this, SIGNAL (clicked()));
-    setFixedSize (mButton->size());
+UIHelpButton::UIHelpButton(QWidget *pParent /* = 0 */)
+  : QPushButton(pParent)
+{
+    setShortcut(QKeySequence(QKeySequence::HelpContents));
+    m_pButton = new UICocoaButton(UICocoaButton::HelpButton, this);
+    connect(m_pButton, SIGNAL(clicked()),
+            this, SIGNAL(clicked()));
+    setFixedSize(m_pButton->size());
 }
 
@@ -86 +86 @@
  *
  ********************************************************************************/
-VBoxSegmentedButton::VBoxSegmentedButton (int aCount, QWidget *aParent /* = 0 */)
-  : UICocoaSegmentedButton (aCount, UICocoaSegmentedButton::RoundRectSegment, aParent)
-{
-}
+UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(int cCount, QWidget *pParent /* = 0 */)
+  : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::RoundRectSegment, pParent)
+{
+}
+
+UITexturedSegmentedButton::UITexturedSegmentedButton(int cCount, QWidget *pParent /* = 0 */)
+  : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::TexturedRoundedSegment, pParent)
+{
+}
+
 /********************************************************************************
  *
@@ -95 +101 @@
  *
  ********************************************************************************/
-VBoxSearchField::VBoxSearchField (QWidget *aParent /* = 0 */)
-  : UICocoaSearchField (aParent)
+UISearchField::UISearchField(QWidget *pParent /* = 0 */)
+  : UICocoaSearchField(pParent)
 {
 }
@@ -113 +119 @@
  *
  ********************************************************************************/
-VBoxMiniCancelButton::VBoxMiniCancelButton (QWidget *aParent /* = 0 */)
-  : QIWithRetranslateUI<QIToolButton> (aParent)
-{
-    setAutoRaise (true);
-    setFocusPolicy (Qt::TabFocus);
-    setShortcut (QKeySequence (Qt::Key_Escape));
+UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */)
+  : QIWithRetranslateUI<QIToolButton>(pParent)
+{
+    setAutoRaise(true);
+    setFocusPolicy(Qt::TabFocus);
+    setShortcut(QKeySequence(Qt::Key_Escape));
     setIcon(UIIconPool::defaultIcon(UIIconPool::DialogCancelIcon));
 }
 
-void VBoxMiniCancelButton::removeBorder()
+void UIMiniCancelButton::removeBorder()
 {
     setStyleSheet("QToolButton { border: 0px }");
@@ -138 +144 @@
 static const int PushButtonBottomOffset = 4;
 
-VBoxHelpButton::VBoxHelpButton (QWidget *aParent /* = 0 */)
-    : QIWithRetranslateUI<QPushButton> (aParent)
+UIHelpButton::UIHelpButton(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QPushButton>(pParent)
 {
 #ifdef Q_WS_MAC
-    mButtonPressed = false;
-    mNormalPixmap = new QPixmap (":/help_button_normal_mac_22px.png");
-    mPressedPixmap = new QPixmap (":/help_button_pressed_mac_22px.png");
-    mSize = mNormalPixmap->size();
-    mMask = new QImage (mNormalPixmap->mask().toImage());
-    mBRect = QRect (PushButtonLeftOffset,
+    m_pButtonPressed = false;
+    m_pNormalPixmap = new QPixmap(":/help_button_normal_mac_22px.png");
+    m_pPressedPixmap = new QPixmap(":/help_button_pressed_mac_22px.png");
+    m_size = m_pNormalPixmap->size();
+    m_pMask = new QImage(m_pNormalPixmap->mask().toImage());
+    m_BRect = QRect(PushButtonLeftOffset,
                     PushButtonTopOffset,
-                    mSize.width(),
-                    mSize.height());
+                    m_size.width(),
+                    m_size.height());
 #endif /* Q_WS_MAC */
     /* Applying language settings */
@@ -156 +162 @@
 }
 
-void VBoxHelpButton::initFrom (QPushButton *aOther)
-{
-    setIcon (aOther->icon());
-    setText (aOther->text());
-    setShortcut (aOther->shortcut());
-    setFlat (aOther->isFlat());
-    setAutoDefault (aOther->autoDefault());
-    setDefault (aOther->isDefault());
+void UIHelpButton::initFrom(QPushButton *pOther)
+{
+    setIcon(pOther->icon());
+    setText(pOther->text());
+    setShortcut(pOther->shortcut());
+    setFlat(pOther->isFlat());
+    setAutoDefault(pOther->autoDefault());
+    setDefault(pOther->isDefault());
     /* Applying language settings */
     retranslateUi();
 }
 
-void VBoxHelpButton::retranslateUi()
-{
-    QPushButton::setText (tr ("&Help"));
+void UIHelpButton::retranslateUi()
+{
+    QPushButton::setText(tr("&Help"));
     if (QPushButton::shortcut().isEmpty())
-        QPushButton::setShortcut (QKeySequence::HelpContents);
+        QPushButton::setShortcut(QKeySequence::HelpContents);
 }
 
 #ifdef Q_WS_MAC
-VBoxHelpButton::~VBoxHelpButton()
-{
-    delete mNormalPixmap;
-    delete mPressedPixmap;
-    delete mMask;
-}
-
-QSize VBoxHelpButton::sizeHint() const
-{
-    return QSize (mSize.width() + PushButtonLeftOffset + PushButtonRightOffset,
-                  mSize.height() + PushButtonTopOffset + PushButtonBottomOffset);
-}
-
-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))
-        return  mMask->pixel (pos.x() - PushButtonLeftOffset,
+UIHelpButton::~UIHelpButton()
+{
+    delete m_pNormalPixmap;
+    delete m_pPressedPixmap;
+    delete m_pMask;
+}
+
+QSize UIHelpButton::sizeHint() const
+{
+    return QSize(m_size.width() + PushButtonLeftOffset + PushButtonRightOffset,
+                 m_size.height() + PushButtonTopOffset + PushButtonBottomOffset);
+}
+
+void UIHelpButton::paintEvent(QPaintEvent * /* pEvent */)
+{
+    QPainter painter(this);
+    painter.drawPixmap(PushButtonLeftOffset, PushButtonTopOffset, m_pButtonPressed ? *m_pPressedPixmap: *m_pNormalPixmap);
+}
+
+bool UIHelpButton::hitButton(const QPoint &pos) const
+{
+    if (m_BRect.contains(pos))
+        return m_pMask->pixel(pos.x() - PushButtonLeftOffset,
                               pos.y() - PushButtonTopOffset) == 0xff000000;
     else
@@ -204 +210 @@
 }
 
-void VBoxHelpButton::mousePressEvent (QMouseEvent *aEvent)
-{
-    if (hitButton (aEvent->pos()))
-        mButtonPressed = true;
-    QPushButton::mousePressEvent (aEvent);
+void UIHelpButton::mousePressEvent(QMouseEvent *pEvent)
+{
+    if (hitButton(pEvent->pos()))
+        m_pButtonPressed = true;
+    QPushButton::mousePressEvent(pEvent);
     update();
 }
 
-void VBoxHelpButton::mouseReleaseEvent (QMouseEvent *aEvent)
-{
-    QPushButton::mouseReleaseEvent (aEvent);
-    mButtonPressed = false;
+void UIHelpButton::mouseReleaseEvent(QMouseEvent *pEvent)
+{
+    QPushButton::mouseReleaseEvent(pEvent);
+    m_pButtonPressed = false;
     update();
 }
 
-void VBoxHelpButton::leaveEvent (QEvent * aEvent)
-{
-    QPushButton::leaveEvent (aEvent);
-    mButtonPressed = false;
+void UIHelpButton::leaveEvent(QEvent * pEvent)
+{
+    QPushButton::leaveEvent(pEvent);
+    m_pButtonPressed = false;
     update();
 }
@@ -232 +238 @@
  *
  ********************************************************************************/
-VBoxSegmentedButton::VBoxSegmentedButton (int aCount, QWidget *aParent /* = 0 */)
-  : QWidget (aParent)
-{
-    mSignalMapper = new QSignalMapper (this);
-
-    QHBoxLayout *layout = new QHBoxLayout (this);
+UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(int aCount, QWidget *pParent /* = 0 */)
+  : QWidget(pParent)
+{
+    m_pSignalMapper = 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);
+        QIToolButton *button = new QIToolButton(this);
+        button->setAutoRaise(true);
+        button->setFocusPolicy(Qt::TabFocus);
+        button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        m_pButtons.append(button);
+        layout->addWidget(button);
+        connect(button, SIGNAL(clicked()),
+                m_pSignalMapper, SLOT(map()));
+        m_pSignalMapper->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();
+    connect(m_pSignalMapper, SIGNAL(mapped(int)),
+            this, SIGNAL(clicked(int)));
+
+}
+
+UIRoundRectSegmentedButton::~UIRoundRectSegmentedButton()
+{
+    delete m_pSignalMapper;
+    qDeleteAll(m_pButtons);
+}
+
+void UIRoundRectSegmentedButton::setTitle(int iSegment, const QString &aTitle)
+{
+    m_pButtons.at(iSegment)->setText(aTitle);
+}
+
+void UIRoundRectSegmentedButton::setToolTip(int iSegment, const QString &strTip)
+{
+    m_pButtons.at(iSegment)->setToolTip(strTip);
+}
+
+void UIRoundRectSegmentedButton::setIcon(int iSegment, const QIcon &icon)
+{
+    m_pButtons.at(iSegment)->setIcon(icon);
+}
+
+void UIRoundRectSegmentedButton::setEnabled(int iSegment, bool fEnabled)
+{
+    m_pButtons.at(iSegment)->setEnabled(fEnabled);
+}
+
+void UIRoundRectSegmentedButton::animateClick(int iSegment)
+{
+    m_pButtons.at(iSegment)->animateClick();
 }
 
@@ -291 +297 @@
  *
  ********************************************************************************/
-VBoxSearchField::VBoxSearchField (QWidget *aParent /* = 0 */)
-  : QLineEdit (aParent)
-{
-    mBaseBrush = palette().base();
-}
-
-void VBoxSearchField::markError()
+UISearchField::UISearchField(QWidget *pParent /* = 0 */)
+  : QLineEdit(pParent)
+{
+    m_baseBrush = palette().base();
+}
+
+void UISearchField::markError()
 {
     QPalette pal = palette();
-    QColor c (Qt::red);
-    c.setAlphaF (0.3);
-    pal.setBrush (QPalette::Base, c);
-    setPalette (pal);
-}
-
-void VBoxSearchField::unmarkError()
+    QColor c(Qt::red);
+    c.setAlphaF(0.3);
+    pal.setBrush(QPalette::Base, c);
+    setPalette(pal);
+}
+
+void UISearchField::unmarkError()
 {
     QPalette pal = palette();
-    pal.setBrush (QPalette::Base, mBaseBrush);
-    setPalette (pal);
+    pal.setBrush(QPalette::Base, m_baseBrush);
+    setPalette(pal);
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
  *
  ********************************************************************************/
-class VBoxMiniCancelButton: public QAbstractButton
-{
-    Q_OBJECT;
-
-public:
-    VBoxMiniCancelButton (QWidget *aParent = 0);
-
-    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:
-    UICocoaButton *mButton;
-};
-
-/********************************************************************************
- *
- * A reset button in the native Cocoa version.
- *
- ********************************************************************************/
-class UIResetButton: public QAbstractButton
-{
-    Q_OBJECT;
-
-public:
-    UIResetButton(QWidget *pParent = 0);
+class UIMiniCancelButton: public QAbstractButton
+{
+    Q_OBJECT;
+
+public:
+    UIMiniCancelButton(QWidget *pParent = 0);
 
     void setText(const QString &strText) { m_pButton->setText(strText); }
@@ -81 +57 @@
 /********************************************************************************
  *
+ * A reset button in the native Cocoa version.
+ *
+ ********************************************************************************/
+class UIResetButton: public QAbstractButton
+{
+    Q_OBJECT;
+
+public:
+    UIResetButton(QWidget *pParent = 0);
+
+    void setText(const QString &strText) { m_pButton->setText(strText); }
+    void setToolTip(const QString &strTip) { m_pButton->setToolTip(strTip); }
+    void removeBorder() {}
+
+protected:
+    void paintEvent(QPaintEvent * /* pEvent */) {}
+    void resizeEvent(QResizeEvent *pEvent);
+
+private:
+    UICocoaButton *m_pButton;
+};
+
+/********************************************************************************
+ *
  * 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:
-    UICocoaButton *mButton;
+class UIHelpButton: public QPushButton
+{
+    Q_OBJECT;
+
+public:
+    UIHelpButton(QWidget *pParent = 0);
+
+    void setToolTip(const QString &strTip) { m_pButton->setToolTip(strTip); }
+
+    void initFrom(QPushButton * /* pOther */) {}
+
+protected:
+    void paintEvent(QPaintEvent * /* pEvent */) {}
+
+private:
+    UICocoaButton *m_pButton;
 };
 
@@ -107 +107 @@
  *
  ********************************************************************************/
-class VBoxSegmentedButton: public UICocoaSegmentedButton
-{
-    Q_OBJECT;
-
-public:
-    VBoxSegmentedButton (int aCount, QWidget *aParent = 0);
+class UIRoundRectSegmentedButton: public UICocoaSegmentedButton
+{
+    Q_OBJECT;
+
+public:
+    UIRoundRectSegmentedButton(int cCount, QWidget *pParent = 0);
+};
+
+class UITexturedSegmentedButton: public UICocoaSegmentedButton
+{
+    Q_OBJECT;
+
+public:
+    UITexturedSegmentedButton(int cCount, QWidget *pParent = 0);
 };
 
@@ -120 +128 @@
  *
  ********************************************************************************/
-class VBoxSearchField: public UICocoaSearchField
-{
-    Q_OBJECT;
-
-public:
-    VBoxSearchField (QWidget *aParent = 0);
+class UISearchField: public UICocoaSearchField
+{
+    Q_OBJECT;
+
+public:
+    UISearchField(QWidget *pParent = 0);
 };
 
@@ -144 +152 @@
  *
  ********************************************************************************/
-class VBoxMiniCancelButton: public QIWithRetranslateUI<QIToolButton>
-{
-    Q_OBJECT;
-
-public:
-    VBoxMiniCancelButton (QWidget *aParent = 0);
+class UIMiniCancelButton: public QIWithRetranslateUI<QIToolButton>
+{
+    Q_OBJECT;
+
+public:
+    UIMiniCancelButton(QWidget *pParent = 0);
     void removeBorder();
 
@@ -161 +169 @@
  *
  ********************************************************************************/
-class UIResetButton: public VBoxMiniCancelButton
+class UIResetButton: public UIMiniCancelButton
 {
     Q_OBJECT;
@@ -167 +175 @@
 public:
     UIResetButton(QWidget *pParent = 0)
-      : VBoxMiniCancelButton(pParent) {}
+      : UIMiniCancelButton(pParent) {}
 };
 
@@ -175 +183 @@
  *
  ********************************************************************************/
-class VBoxHelpButton: public QIWithRetranslateUI<QPushButton>
-{
-    Q_OBJECT;
-
-public:
-    VBoxHelpButton (QWidget *aParent = 0);
+class UIHelpButton: public QIWithRetranslateUI<QPushButton>
+{
+    Q_OBJECT;
+
+public:
+    UIHelpButton(QWidget *pParent = 0);
 #ifdef Q_WS_MAC
-    ~VBoxHelpButton();
+    ~UIHelpButton();
     QSize sizeHint() const;
 #endif /* Q_WS_MAC */
 
-    void initFrom (QPushButton *aOther);
+    void initFrom(QPushButton *pOther);
 
 protected:
@@ -192 +200 @@
 
 #ifdef Q_WS_MAC
-    void paintEvent (QPaintEvent *aEvent);
-
-    bool hitButton (const QPoint &pos) const;
-
-    void mousePressEvent (QMouseEvent *aEvent);
-    void mouseReleaseEvent (QMouseEvent *aEvent);
-    void leaveEvent (QEvent *aEvent);
+    void paintEvent(QPaintEvent *pEvent);
+
+    bool hitButton(const QPoint &pos) const;
+
+    void mousePressEvent(QMouseEvent *pEvent);
+    void mouseReleaseEvent(QMouseEvent *pEvent);
+    void leaveEvent(QEvent *pEvent);
 
 private:
     /* Private member vars */
-    bool mButtonPressed;
-
-    QSize mSize;
-    QPixmap *mNormalPixmap;
-    QPixmap *mPressedPixmap;
-    QImage *mMask;
-    QRect mBRect;
+    bool m_pButtonPressed;
+
+    QSize m_size;
+    QPixmap *m_pNormalPixmap;
+    QPixmap *m_pPressedPixmap;
+    QImage *m_pMask;
+    QRect m_BRect;
 #endif /* Q_WS_MAC */
 };
@@ -217 +225 @@
  *
  ********************************************************************************/
-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);
+class UIRoundRectSegmentedButton: public QWidget
+{
+    Q_OBJECT;
+
+public:
+    UIRoundRectSegmentedButton(int aCount, QWidget *pParent = 0);
+    ~UIRoundRectSegmentedButton();
+
+    void setTitle(int iSegment, const QString &aTitle);
+    void setToolTip(int iSegment, const QString &strTip);
+    void setIcon(int iSegment, const QIcon &icon);
+    void setEnabled(int iSegment, bool fEnabled);
+
+    void animateClick(int iSegment);
 
 signals:
-    void clicked (int aSegment);
+    void clicked(int iSegment);
 
 private:
     /* Private member vars */
-    QList<QIToolButton*> mButtons;
-    QSignalMapper *mSignalMapper;
+    QList<QIToolButton*> m_pButtons;
+    QSignalMapper *m_pSignalMapper;
+};
+
+class UITexturedSegmentedButton: public UIRoundRectSegmentedButton
+{
+    Q_OBJECT;
+
+public:
+    UITexturedSegmentedButton(int cCount, QWidget *pParent = 0)
+      : UIRoundRectSegmentedButton(cCount, pParent) {}
 };
 
@@ -246 +263 @@
  *
  ********************************************************************************/
-class VBoxSearchField: public QLineEdit
-{
-    Q_OBJECT;
-
-public:
-    VBoxSearchField (QWidget *aParent = 0);
+class UISearchField: public QLineEdit
+{
+    Q_OBJECT;
+
+public:
+    UISearchField(QWidget *pParent = 0);
 
     void markError();
@@ -258 +275 @@
 private:
     /* Private member vars */
-    QBrush mBaseBrush;
+    QBrush m_baseBrush;
 };
 

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

@@ -24 +24 @@
 #include "VBoxGlobal.h"
 #include "VBoxProgressDialog.h"
-#include "VBoxSpecialControls.h"
+#include "UISpecialControls.h"
 #ifdef Q_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -90 +90 @@
     if (mCancelEnabled)
     {
-        mCancelBtn = new VBoxMiniCancelButton (this);
+        mCancelBtn = new UIMiniCancelButton (this);
         mCancelBtn->setFocusPolicy (Qt::ClickFocus);
         pLayout2->addWidget (mCancelBtn, 0, Qt::AlignVCenter);

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

@@ -26 +26 @@
 class CProgress;
 class QILabel;
-class VBoxMiniCancelButton;
+class UIMiniCancelButton;
 
 /* Qt forward declarations */
@@ -74 +74 @@
     QString mCancelText;
     QProgressBar *mProgressBar;
-    VBoxMiniCancelButton *mCancelBtn;
+    UIMiniCancelButton *mCancelBtn;
     bool mCancelEnabled;
     const ulong mOpCount;