Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 30356) @@ -306,9 +306,11 @@ 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,7 +322,5 @@ 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,9 +439,10 @@ 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,5 +455,4 @@ src/widgets/VBoxOSTypeSelectorWidget.cpp \ src/widgets/VBoxProgressDialog.cpp \ - src/widgets/VBoxSpecialControls.cpp \ src/widgets/VBoxWarningPane.cpp \ src/runtime/UISession.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp (revision 30356) @@ -23,7 +23,7 @@ #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,9 +348,9 @@ , 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,5 +358,5 @@ this, SLOT (findCurrent (const QString &))); - mButtonsNextPrev = new VBoxSegmentedButton (2, this); + mButtonsNextPrev = new UIRoundRectSegmentedButton(2, this); mButtonsNextPrev->setEnabled (0, false); mButtonsNextPrev->setEnabled (1, false); Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.h (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.h (revision 30356) @@ -20,4 +20,5 @@ #define __VBoxVMLogViewer_h__ +/* Local includes */ #include "VBoxVMLogViewer.gen.h" #include "QIMainDialog.h" @@ -25,13 +26,16 @@ #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, @@ -118,13 +122,13 @@ 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; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp (revision 30356) @@ -19,5 +19,5 @@ #include "QIDialogButtonBox.h" -#include "VBoxSpecialControls.h" +#include "UISpecialControls.h" #include @@ -111,5 +111,5 @@ /* 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); Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h (revision 30356) @@ -28,5 +28,5 @@ class QBoxLayout; -class VBoxHelpButton; +class UIHelpButton; class QIDialogButtonBox: public QIWithRetranslateUI @@ -56,5 +56,5 @@ private: - QPointer mHelpButton; + QPointer mHelpButton; }; Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.ui (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsInput.ui (revision 30356) @@ -124,5 +124,5 @@ UIResetButton QAbstractButton -
VBoxSpecialControls.h
+
UISpecialControls.h
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.cpp (revision 30356) @@ -23,5 +23,5 @@ #include "VBoxGlobal.h" #include "VBoxProblemReporter.h" -#include "VBoxSpecialControls.h" +#include "UISpecialControls.h" /* Global includes */ @@ -32,5 +32,5 @@ : QWidget(pParent) , m_pProgressBar(new QProgressBar(this)) - , m_pCancelButton(new VBoxMiniCancelButton(this)) + , m_pCancelButton(new UIMiniCancelButton(this)) { /* Progress Bar setup */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.h (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIDownloader.h (revision 30356) @@ -26,5 +26,5 @@ /* Local forward declarations */ class QIHttp; -class VBoxMiniCancelButton; +class UIMiniCancelButton; /* Global forward declarations */ @@ -64,5 +64,5 @@ /* Private member vars */ QProgressBar *m_pProgressBar; - VBoxMiniCancelButton *m_pCancelButton; + UIMiniCancelButton *m_pCancelButton; QString m_strSource; Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp (revision 30356) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp (revision 30356) @@ -0,0 +1,322 @@ +/* $Id$ */ +/** @file + * + * VBox frontends: Qt GUI ("VirtualBox"): + * VBoxSpecialButtons implementation + */ + +/* + * Copyright (C) 2009-2010 Oracle Corporation + * + * 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. + */ + +/* VBox includes */ +#include "UIIconPool.h" +#include "UISpecialControls.h" + +/* Global includes */ +#include + +#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS + +/******************************************************************************** + * + * A mini cancel button in the native Cocoa version. + * + ********************************************************************************/ +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()); +} + +/******************************************************************************** + * + * A rest button in the native Cocoa version. + * + ********************************************************************************/ +UIResetButton::UIResetButton(QWidget *pParent /* = 0 */) + : QAbstractButton(pParent) +{ + m_pButton = new UICocoaButton(UICocoaButton::ResetButton, this); + connect(m_pButton, SIGNAL(clicked()), + this, SIGNAL(clicked())); + setFixedSize(m_pButton->size()); +} + +void UIResetButton::resizeEvent(QResizeEvent * /* pEvent */) +{ + m_pButton->resize(size()); +} + +/******************************************************************************** + * + * A help button in the native Cocoa version. + * + ********************************************************************************/ +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()); +} + +/******************************************************************************** + * + * A segmented button in the native Cocoa version. + * + ********************************************************************************/ +UIRoundRectSegmentedButton::UIRoundRectSegmentedButton(int cCount, QWidget *pParent /* = 0 */) + : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::RoundRectSegment, pParent) +{ +} + +UITexturedSegmentedButton::UITexturedSegmentedButton(int cCount, QWidget *pParent /* = 0 */) + : UICocoaSegmentedButton(cCount, UICocoaSegmentedButton::TexturedRoundedSegment, pParent) +{ +} + +/******************************************************************************** + * + * A search field in the native Cocoa version. + * + ********************************************************************************/ +UISearchField::UISearchField(QWidget *pParent /* = 0 */) + : UICocoaSearchField(pParent) +{ +} + +#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ + +/* Qt includes */ +#include +#include +#include +#include + +/******************************************************************************** + * + * A mini cancel button for the other OS's. + * + ********************************************************************************/ +UIMiniCancelButton::UIMiniCancelButton(QWidget *pParent /* = 0 */) + : QIWithRetranslateUI(pParent) +{ + setAutoRaise(true); + setFocusPolicy(Qt::TabFocus); + setShortcut(QKeySequence(Qt::Key_Escape)); + setIcon(UIIconPool::defaultIcon(UIIconPool::DialogCancelIcon)); +} + +void UIMiniCancelButton::removeBorder() +{ + setStyleSheet("QToolButton { border: 0px }"); +} + +/******************************************************************************** + * + * A help button for the other OS's. + * + ********************************************************************************/ +/* From: src/gui/styles/qmacstyle_mac.cpp */ +static const int PushButtonLeftOffset = 6; +static const int PushButtonTopOffset = 4; +static const int PushButtonRightOffset = 12; +static const int PushButtonBottomOffset = 4; + +UIHelpButton::UIHelpButton(QWidget *pParent /* = 0 */) + : QIWithRetranslateUI(pParent) +{ +#ifdef Q_WS_MAC + 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, + m_size.width(), + m_size.height()); +#endif /* Q_WS_MAC */ + /* Applying language settings */ + retranslateUi(); +} + +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 UIHelpButton::retranslateUi() +{ + QPushButton::setText(tr("&Help")); + if (QPushButton::shortcut().isEmpty()) + QPushButton::setShortcut(QKeySequence::HelpContents); +} + +#ifdef Q_WS_MAC +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 + return false; +} + +void UIHelpButton::mousePressEvent(QMouseEvent *pEvent) +{ + if (hitButton(pEvent->pos())) + m_pButtonPressed = true; + QPushButton::mousePressEvent(pEvent); + update(); +} + +void UIHelpButton::mouseReleaseEvent(QMouseEvent *pEvent) +{ + QPushButton::mouseReleaseEvent(pEvent); + m_pButtonPressed = false; + update(); +} + +void UIHelpButton::leaveEvent(QEvent * pEvent) +{ + QPushButton::leaveEvent(pEvent); + m_pButtonPressed = false; + update(); +} +#endif /* Q_WS_MAC */ + +/******************************************************************************** + * + * A segmented button for the other OS's. + * + ********************************************************************************/ +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); + m_pButtons.append(button); + layout->addWidget(button); + connect(button, SIGNAL(clicked()), + m_pSignalMapper, SLOT(map())); + m_pSignalMapper->setMapping(button, i); + } + 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(); +} + +/******************************************************************************** + * + * A search field for the other OS's. + * + ********************************************************************************/ +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 UISearchField::unmarkError() +{ + QPalette pal = palette(); + pal.setBrush(QPalette::Base, m_baseBrush); + setPalette(pal); +} + +#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ + Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h (revision 30356) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h (revision 30356) @@ -0,0 +1,283 @@ +/** @file + * + * VBox frontends: Qt GUI ("VirtualBox"): + * VBoxSpecialButtons declarations + */ + +/* + * Copyright (C) 2009-2010 Oracle Corporation + * + * 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. + */ + +#ifndef ___VBoxSpecialControls_h__ +#define ___VBoxSpecialControls_h__ + +/* VBox includes */ +#include "QIWithRetranslateUI.h" + +/* Qt includes */ +#include + +#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS + +/* VBox includes */ +#include "UICocoaSpecialControls.h" + +/******************************************************************************** + * + * A mini cancel button in the native Cocoa version. + * + ********************************************************************************/ +class UIMiniCancelButton: public QAbstractButton +{ + Q_OBJECT; + +public: + UIMiniCancelButton(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 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 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; +}; + +/******************************************************************************** + * + * A segmented button in the native Cocoa version. + * + ********************************************************************************/ +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); +}; + +/******************************************************************************** + * + * A search field in the native Cocoa version. + * + ********************************************************************************/ +class UISearchField: public UICocoaSearchField +{ + Q_OBJECT; + +public: + UISearchField(QWidget *pParent = 0); +}; + +#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ + +/* VBox includes */ +#include "QIToolButton.h" + +/* Qt includes */ +#include + +/* Qt forward declarations */ +class QSignalMapper; + +/******************************************************************************** + * + * A mini cancel button for the other OS's. + * + ********************************************************************************/ +class UIMiniCancelButton: public QIWithRetranslateUI +{ + Q_OBJECT; + +public: + UIMiniCancelButton(QWidget *pParent = 0); + void removeBorder(); + +protected: + void retranslateUi() {}; +}; + +/******************************************************************************** + * + * A reset button for the other OS's (same as the cancel button for now) + * + ********************************************************************************/ +class UIResetButton: public UIMiniCancelButton +{ + Q_OBJECT; + +public: + UIResetButton(QWidget *pParent = 0) + : UIMiniCancelButton(pParent) {} +}; + +/******************************************************************************** + * + * A help button for the other OS's. + * + ********************************************************************************/ +class UIHelpButton: public QIWithRetranslateUI +{ + Q_OBJECT; + +public: + UIHelpButton(QWidget *pParent = 0); +#ifdef Q_WS_MAC + ~UIHelpButton(); + QSize sizeHint() const; +#endif /* Q_WS_MAC */ + + void initFrom(QPushButton *pOther); + +protected: + void retranslateUi(); + +#ifdef Q_WS_MAC + 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 m_pButtonPressed; + + QSize m_size; + QPixmap *m_pNormalPixmap; + QPixmap *m_pPressedPixmap; + QImage *m_pMask; + QRect m_BRect; +#endif /* Q_WS_MAC */ +}; + +/******************************************************************************** + * + * A segmented button for the other OS's. + * + ********************************************************************************/ +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 iSegment); + +private: + /* Private member vars */ + QList m_pButtons; + QSignalMapper *m_pSignalMapper; +}; + +class UITexturedSegmentedButton: public UIRoundRectSegmentedButton +{ + Q_OBJECT; + +public: + UITexturedSegmentedButton(int cCount, QWidget *pParent = 0) + : UIRoundRectSegmentedButton(cCount, pParent) {} +}; + +/******************************************************************************** + * + * A search field for the other OS's. + * + ********************************************************************************/ +class UISearchField: public QLineEdit +{ + Q_OBJECT; + +public: + UISearchField(QWidget *pParent = 0); + + void markError(); + void unmarkError(); + +private: + /* Private member vars */ + QBrush m_baseBrush; +}; + +#endif /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ + +#endif /* ___VBoxSpecialControls_h__ */ + Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.cpp (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.cpp (revision 30356) @@ -24,5 +24,5 @@ #include "VBoxGlobal.h" #include "VBoxProgressDialog.h" -#include "VBoxSpecialControls.h" +#include "UISpecialControls.h" #ifdef Q_WS_MAC # include "VBoxUtils-darwin.h" @@ -90,5 +90,5 @@ if (mCancelEnabled) { - mCancelBtn = new VBoxMiniCancelButton (this); + mCancelBtn = new UIMiniCancelButton (this); mCancelBtn->setFocusPolicy (Qt::ClickFocus); pLayout2->addWidget (mCancelBtn, 0, Qt::AlignVCenter); Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.h (revision 30355) +++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxProgressDialog.h (revision 30356) @@ -26,5 +26,5 @@ class CProgress; class QILabel; -class VBoxMiniCancelButton; +class UIMiniCancelButton; /* Qt forward declarations */ @@ -74,5 +74,5 @@ QString mCancelText; QProgressBar *mProgressBar; - VBoxMiniCancelButton *mCancelBtn; + UIMiniCancelButton *mCancelBtn; bool mCancelEnabled; const ulong mOpCount; Index: unk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.cpp (revision 30355) +++ (revision ) @@ -1,316 +1,0 @@ -/* $Id$ */ -/** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * VBoxSpecialButtons implementation - */ - -/* - * Copyright (C) 2009 Oracle Corporation - * - * 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. - */ - -/* VBox includes */ -#include "UIIconPool.h" -#include "VBoxSpecialControls.h" - -/* Global includes */ -#include - -#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 UICocoaButton (UICocoaButton::CancelButton, this); - connect (mButton, SIGNAL (clicked()), - this, SIGNAL (clicked())); - setFixedSize (mButton->size()); -} - -void VBoxMiniCancelButton::resizeEvent(QResizeEvent * /* pEvent */) -{ - mButton->resize(size()); -} - -/******************************************************************************** - * - * A rest button in the native Cocoa version. - * - ********************************************************************************/ -UIResetButton::UIResetButton(QWidget *pParent /* = 0 */) - : QAbstractButton(pParent) -{ - m_pButton = new UICocoaButton(UICocoaButton::ResetButton, this); - connect(m_pButton, SIGNAL(clicked()), - this, SIGNAL(clicked())); - setFixedSize(m_pButton->size()); -} - -void UIResetButton::resizeEvent(QResizeEvent * /* pEvent */) -{ - m_pButton->resize(size()); -} - -/******************************************************************************** - * - * A help button in the native Cocoa version. - * - ********************************************************************************/ -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()); -} - -/******************************************************************************** - * - * A segmented button in the native Cocoa version. - * - ********************************************************************************/ -VBoxSegmentedButton::VBoxSegmentedButton (int aCount, QWidget *aParent /* = 0 */) - : UICocoaSegmentedButton (aCount, UICocoaSegmentedButton::RoundRectSegment, aParent) -{ -} -/******************************************************************************** - * - * A search field in the native Cocoa version. - * - ********************************************************************************/ -VBoxSearchField::VBoxSearchField (QWidget *aParent /* = 0 */) - : UICocoaSearchField (aParent) -{ -} - -#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ - -/* Qt includes */ -#include -#include -#include -#include - -/******************************************************************************** - * - * A mini cancel button for the other OS's. - * - ********************************************************************************/ -VBoxMiniCancelButton::VBoxMiniCancelButton (QWidget *aParent /* = 0 */) - : QIWithRetranslateUI (aParent) -{ - setAutoRaise (true); - setFocusPolicy (Qt::TabFocus); - setShortcut (QKeySequence (Qt::Key_Escape)); - setIcon(UIIconPool::defaultIcon(UIIconPool::DialogCancelIcon)); -} - -void VBoxMiniCancelButton::removeBorder() -{ - setStyleSheet("QToolButton { border: 0px }"); -} - -/******************************************************************************** - * - * A help button for the other OS's. - * - ********************************************************************************/ -/* From: src/gui/styles/qmacstyle_mac.cpp */ -static const int PushButtonLeftOffset = 6; -static const int PushButtonTopOffset = 4; -static const int PushButtonRightOffset = 12; -static const int PushButtonBottomOffset = 4; - -VBoxHelpButton::VBoxHelpButton (QWidget *aParent /* = 0 */) - : QIWithRetranslateUI (aParent) -{ -#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, - PushButtonTopOffset, - mSize.width(), - mSize.height()); -#endif /* Q_WS_MAC */ - /* Applying language settings */ - retranslateUi(); -} - -void VBoxHelpButton::initFrom (QPushButton *aOther) -{ - setIcon (aOther->icon()); - setText (aOther->text()); - setShortcut (aOther->shortcut()); - setFlat (aOther->isFlat()); - setAutoDefault (aOther->autoDefault()); - setDefault (aOther->isDefault()); - /* Applying language settings */ - retranslateUi(); -} - -void VBoxHelpButton::retranslateUi() -{ - QPushButton::setText (tr ("&Help")); - if (QPushButton::shortcut().isEmpty()) - 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, - pos.y() - PushButtonTopOffset) == 0xff000000; - else - return false; -} - -void VBoxHelpButton::mousePressEvent (QMouseEvent *aEvent) -{ - if (hitButton (aEvent->pos())) - mButtonPressed = true; - QPushButton::mousePressEvent (aEvent); - update(); -} - -void VBoxHelpButton::mouseReleaseEvent (QMouseEvent *aEvent) -{ - QPushButton::mouseReleaseEvent (aEvent); - mButtonPressed = false; - update(); -} - -void VBoxHelpButton::leaveEvent (QEvent * aEvent) -{ - QPushButton::leaveEvent (aEvent); - mButtonPressed = false; - update(); -} -#endif /* Q_WS_MAC */ - -/******************************************************************************** - * - * 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 */ - Index: unk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxSpecialControls.h (revision 30355) +++ (revision ) @@ -1,266 +1,0 @@ -/** @file - * - * VBox frontends: Qt GUI ("VirtualBox"): - * VBoxSpecialButtons declarations - */ - -/* - * Copyright (C) 2009 Oracle Corporation - * - * 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. - */ - -#ifndef ___VBoxSpecialControls_h__ -#define ___VBoxSpecialControls_h__ - -/* VBox includes */ -#include "QIWithRetranslateUI.h" - -/* Qt includes */ -#include - -#ifdef VBOX_DARWIN_USE_NATIVE_CONTROLS - -/* VBox includes */ -#include "UICocoaSpecialControls.h" - -/******************************************************************************** - * - * A mini cancel button in the native Cocoa version. - * - ********************************************************************************/ -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); - - 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; -}; - -/******************************************************************************** - * - * A segmented button in the native Cocoa version. - * - ********************************************************************************/ -class VBoxSegmentedButton: public UICocoaSegmentedButton -{ - Q_OBJECT; - -public: - VBoxSegmentedButton (int aCount, QWidget *aParent = 0); -}; - -/******************************************************************************** - * - * A search field in the native Cocoa version. - * - ********************************************************************************/ -class VBoxSearchField: public UICocoaSearchField -{ - Q_OBJECT; - -public: - VBoxSearchField (QWidget *aParent = 0); -}; - -#else /* VBOX_DARWIN_USE_NATIVE_CONTROLS */ - -/* VBox includes */ -#include "QIToolButton.h" - -/* Qt includes */ -#include - -/* Qt forward declarations */ -class QSignalMapper; - -/******************************************************************************** - * - * A mini cancel button for the other OS's. - * - ********************************************************************************/ -class VBoxMiniCancelButton: public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - VBoxMiniCancelButton (QWidget *aParent = 0); - void removeBorder(); - -protected: - void retranslateUi() {}; -}; - -/******************************************************************************** - * - * A reset button for the other OS's (same as the cancel button for now) - * - ********************************************************************************/ -class UIResetButton: public VBoxMiniCancelButton -{ - Q_OBJECT; - -public: - UIResetButton(QWidget *pParent = 0) - : VBoxMiniCancelButton(pParent) {} -}; - -/******************************************************************************** - * - * A help button for the other OS's. - * - ********************************************************************************/ -class VBoxHelpButton: public QIWithRetranslateUI -{ - 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 - void paintEvent (QPaintEvent *aEvent); - - bool hitButton (const QPoint &pos) const; - - void mousePressEvent (QMouseEvent *aEvent); - void mouseReleaseEvent (QMouseEvent *aEvent); - void leaveEvent (QEvent *aEvent); - -private: - /* Private member vars */ - bool mButtonPressed; - - QSize mSize; - QPixmap *mNormalPixmap; - QPixmap *mPressedPixmap; - QImage *mMask; - QRect mBRect; -#endif /* Q_WS_MAC */ -}; - -/******************************************************************************** - * - * 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 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__ */ -