Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 91713) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 91714) @@ -917,6 +917,4 @@ src/wizards/UINativeWizard.h \ src/wizards/UINativeWizardPage.h \ - src/wizards/UIWizard.h \ - src/wizards/UIWizardPage.h \ src/wizards/editors/UIWizardDiskEditors.h \ src/wizards/newvd/UIWizardNewVD.h \ @@ -1474,6 +1472,4 @@ src/wizards/UINativeWizard.cpp \ src/wizards/UINativeWizardPage.cpp \ - src/wizards/UIWizard.cpp \ - src/wizards/UIWizardPage.cpp \ src/wizards/editors/UIWizardDiskEditors.cpp \ src/wizards/newvd/UIWizardNewVD.cpp \ Index: unk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp (revision 91713) +++ (revision ) @@ -1,549 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIWizard class implementation. - */ - -/* - * Copyright (C) 2009-2020 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. - */ - -/* Qt includes: */ -#include -#include -#include -#include - -/* GUI includes: */ -#include "UIIconPool.h" -#include "UIWizard.h" -#include "UIWizardPage.h" -#include "UICommon.h" -#include "UIMessageCenter.h" -#include "QIRichTextLabel.h" -#include "UIExtraDataManager.h" - -/* Qt includes: */ -#include - - -void UIWizard::prepare() -{ - // WORKAROUND: - // In Qt 5.15 setting fusion application style leaves wizard style undetermined (unset). - // But there is no "unset" enum value, so it's kinda 0, which means QWizard::ClassicStyle. - // But by the fact wizard doesn't get rendered as QWizard::ClassicStyle, layout is broken. - // So, we are forcing QWizard::ClassicStyle ourselves .. - if (wizardStyle() == QWizard::ClassicStyle) - setWizardStyle(QWizard::ClassicStyle); - - /* Translate wizard: */ - retranslateUi(); - /* Translate wizard pages: */ - retranslatePages(); - - /* Resize wizard to 'golden ratio': */ - resizeToGoldenRatio(); - - /* Notify pages they are ready: */ - QList ids = pageIds(); - for (int i = 0; i < ids.size(); ++i) - qobject_cast(page(ids[i]))->markReady(); - - /* Make sure custom buttons shown even if final page is first to show: */ - sltCurrentIdChanged(startId()); -} - -UIWizard::UIWizard(QWidget *pParent, WizardType enmType, WizardMode enmMode /* = WizardMode_Auto */) - : QIWithRetranslateUI(pParent) - , m_enmType(enmType) - , m_enmMode(enmMode == WizardMode_Auto ? gEDataManager->modeForWizardType(m_enmType) : enmMode) -{ -#ifdef VBOX_WS_WIN - /* Hide window icon: */ - setWindowIcon(QIcon()); -#endif - -#ifdef VBOX_WS_MAC - // WORKAROUND: - // Since wizards are now represented as Mac OS X Sheets - // we would like to have possibility to cancel them. - setOption(QWizard::NoCancelButton, false); - - // WORKAROUND: - // I'm really not sure why there shouldn't be any default button on Mac OS X. - // This prevents the using of Enter to jump to the next page. - setOptions(options() ^ QWizard::NoDefaultButton); -#endif /* VBOX_WS_MAC */ - - /* Using window-modality: */ - setWindowModality(Qt::WindowModal); - - /* Setup connections: */ - connect(this, &UIWizard::currentIdChanged, this, &UIWizard::sltCurrentIdChanged); - connect(this, &UIWizard::customButtonClicked, this, &UIWizard::sltCustomButtonClicked); -} - -void UIWizard::retranslateUi() -{ - /* Translate basic/expert button: */ - switch (m_enmMode) - { - case WizardMode_Basic: - setButtonText(QWizard::CustomButton1, tr("&Expert Mode")); - button(QWizard::CustomButton1)->setToolTip(tr("Switch to Expert Mode, a one-page dialog for experienced users.")); - break; - case WizardMode_Expert: - setButtonText(QWizard::CustomButton1, tr("&Guided Mode")); - button(QWizard::CustomButton1)->setToolTip(tr("Switch to Guided Mode, a step-by-step dialog with detailed explanations.")); - break; - default: - AssertMsgFailed(("Invalid mode: %d", m_enmMode)); - break; - } -} - -void UIWizard::showEvent(QShowEvent *pEvent) -{ - /* Resize to minimum possible size: */ - resize(0, 0); - - /* Call to base-class: */ - QWizard::showEvent(pEvent); -} - -void UIWizard::setPage(int iId, UIWizardPage *pPage) -{ - /* Configure page first: */ - configurePage(pPage); - /* Add page finally: */ - QWizard::setPage(iId, pPage); -} - -void UIWizard::cleanup() -{ - /* Remove all the pages: */ - const QList ids = pageIds(); - for (int i = ids.size() - 1; i >= 0 ; --i) - { - /* Get enumerated page ID: */ - const int iId = ids.at(i); - /* Get corresponding page: */ - QWizardPage *pWizardPage = page(iId); - - /* Remove page from the wizard: */ - removePage(iId); - /* Delete page finally: */ - delete pWizardPage; - } - -#ifndef VBOX_WS_MAC - /* Cleanup watermark: */ - if (!m_strWatermarkName.isEmpty()) - setPixmap(QWizard::WatermarkPixmap, QPixmap()); -#endif -} - -void UIWizard::resizeToGoldenRatio() -{ - /* Check if wizard is in basic or expert mode: */ - if (m_enmMode == WizardMode_Expert) - { - // WORKAROUND: - // Unfortunately QWizard hides some of useful API in private part, - // and also have few layouting bugs which could be easy fixed - // by that API, so we will use QWizard::restart() method - // to call the same functionality indirectly... - // Early call restart() which is usually goes on show()! - restart(); - - // WORKAROUND: - // Now we have correct label size-hint(s) for all the pages. - // We have to make sure all the pages uses maximum available size-hint. - QSize maxOfSizeHints; - QList pages = findChildren(); - /* Search for the maximum available size-hint: */ - foreach (UIWizardPage *pPage, pages) - { - maxOfSizeHints.rwidth() = pPage->sizeHint().width() > maxOfSizeHints.width() ? - pPage->sizeHint().width() : maxOfSizeHints.width(); - maxOfSizeHints.rheight() = pPage->sizeHint().height() > maxOfSizeHints.height() ? - pPage->sizeHint().height() : maxOfSizeHints.height(); - } - /* Feat corresponding height: */ - maxOfSizeHints.setWidth(qMax((int)(1.5 * maxOfSizeHints.height()), maxOfSizeHints.width())); - /* Use that size-hint for all the pages: */ - foreach (UIWizardPage *pPage, pages) - pPage->setMinimumSize(maxOfSizeHints); - - /* Relayout widgets: */ - QList layouts = findChildren(); - foreach(QLayout *pLayout, layouts) - pLayout->activate(); - - // WORKAROUND: - // Unfortunately QWizard hides some of useful API in private part, - // and also have few layouting bugs which could be easy fixed - // by that API, so we will use QWizard::restart() method - // to call the same functionality indirectly... - // And now we call restart() after layout activation procedure! - restart(); - - /* Resize it to minimum size: */ - resize(QSize(0, 0)); - } - else - { - /* Use some small (!) initial QIRichTextLabel width: */ - int iInitialLabelWidth = 200; - - /* Resize wizard according that initial width, - * actually there could be other content - * which wants to be wider than that initial width. */ - resizeAccordingLabelWidth(iInitialLabelWidth); - - /* Get some (first) of those pages: */ - QList pids = pageIds(); - UIWizardPage *pPage = qobject_cast(page(pids.first())); - /* Calculate actual label width: */ - int iPageWidth = pPage->minimumWidth(); - int iLeft, iTop, iRight, iBottom; - pPage->layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom); - int iCurrentLabelWidth = iPageWidth - iLeft - iRight; - /* Calculate summary margin length, - * including margins of the page and the wizard: */ - int iMarginsLength = width() - iCurrentLabelWidth; - - /* Get current wizard width and height: */ - int iCurrentWizardWidth = width(); - int iCurrentWizardHeight = height(); -#ifndef VBOX_WS_MAC - /* Calculate metric and ratio: */ - const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize); - const double dRatio = (double)iIconMetric / 32; - /* Load pixmap to icon first: */ - QIcon icon = UIIconPool::iconSet(m_strWatermarkName); - QSize size = icon.availableSizes().value(0, QSize(145, 290)); - size *= dRatio; - /* We should take into account watermark like its assigned already: */ - QPixmap watermarkPixmap(icon.pixmap(size)); - const int iWatermarkWidth = watermarkPixmap.width() * dRatio; - iCurrentWizardWidth += iWatermarkWidth; -#endif /* !VBOX_WS_MAC */ - /* Calculating nearest to 'golden ratio' label width: */ - int iGoldenRatioWidth = (int)qSqrt(ratio() * iCurrentWizardWidth * iCurrentWizardHeight); - int iProposedLabelWidth = iGoldenRatioWidth - iMarginsLength; -#ifndef VBOX_WS_MAC - /* We should take into account watermark like its assigned already: */ - iProposedLabelWidth -= iWatermarkWidth; -#endif /* !VBOX_WS_MAC */ - - /* Choose maximum between current and proposed label width: */ - int iNewLabelWidth = qMax(iCurrentLabelWidth, iProposedLabelWidth); - - /* Finally resize wizard according new label width, - * taking into account all the content and 'golden ratio' rule: */ - resizeAccordingLabelWidth(iNewLabelWidth); - } - -#ifndef VBOX_WS_MAC - /* Really assign watermark: */ - if (!m_strWatermarkName.isEmpty()) - assignWatermarkHelper(); -#endif -} - -#ifndef VBOX_WS_MAC - -void UIWizard::assignWatermark(const QString &strWatermark) -{ - m_strWatermarkName = strWatermark; -} - -#else - -void UIWizard::assignBackground(const QString &strBackground) -{ - setPixmap(QWizard::BackgroundPixmap, strBackground); -} - -#endif - -void UIWizard::enableHelpButton(const QString &strHelpKeyword) -{ - setOptions(options() | QWizard::HaveHelpButton); - uiCommon().setHelpKeyword(this, strHelpKeyword); - if (button(QWizard::HelpButton)) - button(QWizard::HelpButton)->setShortcut(QKeySequence::HelpContents); - connect(this, &UIWizard::helpRequested, &msgCenter(), &UIMessageCenter::sltHandleHelpRequest); -} - -void UIWizard::sltCurrentIdChanged(int iId) -{ - /* Hide/show description button disabled by default: */ - bool fIsHideShowDescriptionButtonAvailable = false; - /* Enable hide/show description button for 1st page: */ - if (iId == 0) - fIsHideShowDescriptionButtonAvailable = true; - /* Set a flag for hide/show description button finally: */ - setOption(QWizard::HaveCustomButton1, fIsHideShowDescriptionButtonAvailable); -} - -void UIWizard::sltCustomButtonClicked(int iId) -{ - /* Handle 1st button: */ - if (iId == CustomButton1) - { - /* Cleanup: */ - cleanup(); - - /* Toggle mode: */ - switch (m_enmMode) - { - case WizardMode_Basic: m_enmMode = WizardMode_Expert; break; - case WizardMode_Expert: m_enmMode = WizardMode_Basic; break; - default: AssertMsgFailed(("Invalid mode: %d", m_enmMode)); break; - } - /* Save mode: */ - gEDataManager->setModeForWizardType(m_enmType, m_enmMode); - - /* Prepare: */ - prepare(); - } -} - -void UIWizard::retranslatePages() -{ - /* Translate all the pages: */ - QList ids = pageIds(); - for (int i = 0; i < ids.size(); ++i) - qobject_cast(page(ids[i]))->retranslate(); -} - -void UIWizard::configurePage(UIWizardPage *pPage) -{ - /* Page margins: */ - switch (wizardStyle()) - { - case QWizard::ClassicStyle: - { - int iLeft, iTop, iRight, iBottom; - pPage->layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom); - pPage->layout()->setContentsMargins(iLeft, iTop, 0, 0); - break; - } - default: - break; - } -} - -void UIWizard::resizeAccordingLabelWidth(int iLabelsWidth) -{ - // WORKAROUND: - // Unfortunately QWizard hides some of useful API in private part, - // and also have few layouting bugs which could be easy fixed - // by that API, so we will use QWizard::restart() method - // to call the same functionality indirectly... - // Early call restart() which is usually goes on show()! - restart(); - - /* Update QIRichTextLabel(s) text-width(s): */ - QList labels = findChildren(); - foreach (QIRichTextLabel *pLabel, labels) - pLabel->setMinimumTextWidth(iLabelsWidth); - - /* Now we have correct label size-hint(s) for all the pages. - * We have to make sure all the pages uses maximum available size-hint. */ - QSize maxOfSizeHints; - QList pages = findChildren(); - /* Search for the maximum available size-hint: */ - foreach (UIWizardPage *pPage, pages) - { - maxOfSizeHints.rwidth() = pPage->sizeHint().width() > maxOfSizeHints.width() ? - pPage->sizeHint().width() : maxOfSizeHints.width(); - maxOfSizeHints.rheight() = pPage->sizeHint().height() > maxOfSizeHints.height() ? - pPage->sizeHint().height() : maxOfSizeHints.height(); - } - /* Use that size-hint for all the pages: */ - foreach (UIWizardPage *pPage, pages) - pPage->setMinimumSize(maxOfSizeHints); - - /* Relayout widgets: */ - QList layouts = findChildren(); - foreach(QLayout *pLayout, layouts) - pLayout->activate(); - - // WORKAROUND: - // Unfortunately QWizard hides some of useful API in private part, - // and also have few layouting bugs which could be easy fixed - // by that API, so we will use QWizard::restart() method - // to call the same functionality indirectly... - // And now we call restart() after layout activation procedure! - restart(); - - /* Resize it to minimum size: */ - resize(QSize(0, 0)); -} - -double UIWizard::ratio() const -{ - /* Default value: */ - double dRatio = 1.6; - -#ifdef VBOX_WS_WIN - switch (wizardStyle()) - { - case QWizard::ClassicStyle: - case QWizard::ModernStyle: - // WORKAROUND: - // There is a Qt bug about Windows7 do NOT match conditions for 'aero' wizard-style, - // so its silently fallbacks to 'modern' one without any notification, - // so QWizard::wizardStyle() returns QWizard::ModernStyle, while using aero, at least partially. - if (QSysInfo::windowsVersion() != QSysInfo::WV_WINDOWS7) - { - dRatio = 2; - break; - } - case QWizard::AeroStyle: - dRatio = 2.2; - break; - default: - break; - } -#endif /* VBOX_WS_WIN */ - - switch (m_enmType) - { - case WizardType_CloneVM: - case WizardType_ExportAppliance: - case WizardType_ImportAppliance: - dRatio -= 0.4; - break; - case WizardType_NewVD: - case WizardType_CloneVD: - dRatio += 0.1; - break; - default: - break; - } - - /* Return final result: */ - return dRatio; -} - -#ifndef VBOX_WS_MAC -int UIWizard::proposedWatermarkHeight() -{ - /* We should calculate suitable height for watermark pixmap, - * for that we have to take into account: - * 1. wizard-layout top-margin (for modern style), - * 2. wizard-header height, - * 3. spacing between wizard-header and wizard-page, - * 4. wizard-page height, - * 5. wizard-layout bottom-margin (for modern style). */ - - /* Get current application style: */ - QStyle *pStyle = QApplication::style(); - - /* Acquire wizard-layout top-margin: */ - int iTopMargin = 0; - if (m_enmMode == WizardMode_Basic) - { - if (wizardStyle() == QWizard::ModernStyle) - iTopMargin = pStyle->pixelMetric(QStyle::PM_LayoutTopMargin); - } - - /* Acquire wizard-header height: */ - int iTitleHeight = 0; - if (m_enmMode == WizardMode_Basic) - { - /* We have no direct access to QWizardHeader inside QWizard private data... - * From Qt sources it seems title font is hardcoded as current font point-size + 4: */ - QFont titleFont(QApplication::font()); - titleFont.setPointSize(titleFont.pointSize() + 4); - QFontMetrics titleFontMetrics(titleFont); - iTitleHeight = titleFontMetrics.height(); - } - - /* Acquire spacing between wizard-header and wizard-page: */ - int iMarginBetweenTitleAndPage = 0; - if (m_enmMode == WizardMode_Basic) - { - /* We have no direct access to margin between QWizardHeader and wizard-pages... - * From Qt sources it seems its hardcoded as just 7 pixels: */ - iMarginBetweenTitleAndPage = 7; - } - - /* Acquire wizard-page height: */ - int iPageHeight = 0; - if (page(0)) - { - iPageHeight = page(0)->minimumSize().height(); - } - - /* Acquire wizard-layout bottom-margin: */ - int iBottomMargin = 0; - if (wizardStyle() == QWizard::ModernStyle) - iBottomMargin = pStyle->pixelMetric(QStyle::PM_LayoutBottomMargin); - - /* Finally, calculate summary height: */ - return iTopMargin + iTitleHeight + iMarginBetweenTitleAndPage + iPageHeight + iBottomMargin; -} - -void UIWizard::assignWatermarkHelper() -{ - /* Load pixmap to icon first: */ - QIcon icon = UIIconPool::iconSet(m_strWatermarkName); - /* Create initial watermark pixmap. - * For HiDPI support parent-widget's device pixel ratio is to be taken into account: */ - QPixmap pixWaterMark( parentWidget() - ? icon.pixmap(parentWidget()->windowHandle(), QSize(145, 290)) - : icon.pixmap(QSize(145, 290))); - /* Convert watermark to image which - * allows to manage pixel data directly: */ - QImage imgWatermark = pixWaterMark.toImage(); - /* Use the right-top watermark pixel as frame color: */ - QRgb rgbFrame = imgWatermark.pixel(imgWatermark.width() - 1, 0); - /* Create final image on the basis of incoming, applying the rules: */ - QImage imgWatermarkNew(imgWatermark.width(), qMax(imgWatermark.height(), proposedWatermarkHeight()), imgWatermark.format()); - for (int y = 0; y < imgWatermarkNew.height(); ++y) - { - for (int x = 0; x < imgWatermarkNew.width(); ++x) - { - /* Border rule 1 - draw border for ClassicStyle */ - if (wizardStyle() == QWizard::ClassicStyle && - (x == 0 || y == 0 || x == imgWatermarkNew.width() - 1 || y == imgWatermarkNew.height() - 1)) - imgWatermarkNew.setPixel(x, y, rgbFrame); - /* Border rule 2 - draw border for ModernStyle */ - else if (wizardStyle() == QWizard::ModernStyle && x == imgWatermarkNew.width() - 1) - imgWatermarkNew.setPixel(x, y, rgbFrame); - /* Horizontal extension rule - use last used color */ - else if (x >= imgWatermark.width() && y < imgWatermark.height()) - imgWatermarkNew.setPixel(x, y, imgWatermark.pixel(imgWatermark.width() - 1, y)); - /* Vertical extension rule - use last used color */ - else if (y >= imgWatermark.height() && x < imgWatermark.width()) - imgWatermarkNew.setPixel(x, y, imgWatermark.pixel(x, imgWatermark.height() - 1)); - /* Common extension rule - use last used color */ - else if (x >= imgWatermark.width() && y >= imgWatermark.height()) - imgWatermarkNew.setPixel(x, y, imgWatermark.pixel(imgWatermark.width() - 1, imgWatermark.height() - 1)); - /* Else just copy color */ - else - imgWatermarkNew.setPixel(x, y, imgWatermark.pixel(x, y)); - } - } - /* Convert processed image to pixmap and assign it to wizard's watermark. */ - QPixmap pixWatermarkNew = QPixmap::fromImage(imgWatermarkNew); - /* For HiDPI support parent-widget's device pixel ratio is to be taken into account: */ - const double dRatio = parentWidget()->window()->windowHandle()->devicePixelRatio(); - pixWatermarkNew.setDevicePixelRatio(dRatio); - /* Assign watermark finally: */ - setPixmap(QWizard::WatermarkPixmap, pixWatermarkNew); -} -#endif /* !VBOX_WS_MAC */ Index: unk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.h (revision 91713) +++ (revision ) @@ -1,125 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIWizard class declaration. - */ - -/* - * Copyright (C) 2009-2020 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 FEQT_INCLUDED_SRC_wizards_UIWizard_h -#define FEQT_INCLUDED_SRC_wizards_UIWizard_h -#ifndef RT_WITHOUT_PRAGMA_ONCE -# pragma once -#endif - -/* Qt includes: */ -#include -#include - -/* GUI includes: */ -#include "QIWithRetranslateUI.h" -#include "UIExtraDataDefs.h" -#include "UILibraryDefs.h" - -/* Forward declarations: */ -class QShowEvent; -class QString; -class QWidget; -class UIWizardPage; - -/** QWizard extension with advanced functionality. */ -class SHARED_LIBRARY_STUFF UIWizard : public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - - /** Returns wizard mode. */ - WizardMode mode() const { return m_enmMode; } - - /** Prepare all. */ - virtual void prepare(); - -protected: - - /** Constructs wizard passing @a pParent to the base-class. - * @param enmType Brings the wizard type. - * @param enmMode Brings the wizard mode. */ - UIWizard(QWidget *pParent, WizardType enmType, WizardMode enmMode = WizardMode_Auto); - - /** Handles translation event. */ - virtual void retranslateUi() /* override */; - - /** Handles show @a pEvent. */ - virtual void showEvent(QShowEvent *pEvent) /* override */; - - /** Assigns @a pPage as a wizard page with certain @a iId. */ - void setPage(int iId, UIWizardPage *pPage); - /** Removes all the pages. */ - void cleanup(); - - /** Resizes wizard to golden ratio. */ - void resizeToGoldenRatio(); - -#ifndef VBOX_WS_MAC - /** Assigns @a strWaterMark. */ - void assignWatermark(const QString &strWaterMark); -#else - /** Assigns @a strBackground. */ - void assignBackground(const QString &strBackground); -#endif - /** Inserts the standard help button to the button box of the wizard. @param strHelpKeyword - * is set as property. This is used for context sensitive help. */ - void enableHelpButton(const QString &strHelpKeyword); - -protected slots: - - /** Handles current-page change to page with @a iId. */ - virtual void sltCurrentIdChanged(int iId); - /** Handles custome-button click for button with @a iId. */ - virtual void sltCustomButtonClicked(int iId); - -private: - - /** Performs pages translation. */ - void retranslatePages(); - - /** Configures certain @a pPage. */ - void configurePage(UIWizardPage *pPage); - - /** Resizes wizard according certain @a iLabelWidth. */ - void resizeAccordingLabelWidth(int iLabelWidth); - - /** Returns ratio corresponding to current wizard type. */ - double ratio() const; - -#ifndef VBOX_WS_MAC - /** Returns proposed watermark height. */ - int proposedWatermarkHeight(); - /** Assigns cached watermark. */ - void assignWatermarkHelper(); -#endif - - /** Holds the wizard type. */ - WizardType m_enmType; - /** Holds the wizard mode. */ - WizardMode m_enmMode; -#ifndef VBOX_WS_MAC - /** Holds the watermark name. */ - QString m_strWatermarkName; -#endif -}; - -/** Wizard interface safe-pointer. */ -typedef QPointer UISafePointerWizard; - -#endif /* !FEQT_INCLUDED_SRC_wizards_UIWizard_h */ Index: unk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.cpp (revision 91713) +++ (revision ) @@ -1,90 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIWizardPage class implementation. - */ - -/* - * Copyright (C) 2009-2020 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. - */ - -/* Qt includes: */ -#include - -/* GUI includes: */ -#include "UICommon.h" -#include "UIWizard.h" -#include "UIWizardPage.h" - - -/********************************************************************************************************************************* -* Class UIWizardPageBase implementation. * -*********************************************************************************************************************************/ - -UIWizard *UIWizardPageBase::wizardImp() const -{ - /* Should be reimplemented in sub-class to enable access to wizard! */ - AssertMsgFailed(("UIWizardPageBase::wizardImp() should be reimplemented!")); - return 0; -} - -UIWizardPage *UIWizardPageBase::thisImp() -{ - /* Should be reimplemented in sub-class to enable access to wizard page! */ - AssertMsgFailed(("UIWizardPageBase::thisImp() should be reimplemented!")); - return 0; -} - -QVariant UIWizardPageBase::fieldImp(const QString &) const -{ - /* Should be reimplemented in sub-class to enable access to wizard field! */ - AssertMsgFailed(("UIWizardPageBase::fieldImp(const QString &) should be reimplemented!")); - return QVariant(); -} - - -/********************************************************************************************************************************* -* Class UIWizardPage implementation. * -*********************************************************************************************************************************/ - -UIWizardPage::UIWizardPage() - : m_fReady(false) -{ -} - -void UIWizardPage::markReady() -{ - m_fReady = true; - QWizardPage::setTitle(m_strTitle); -} - -void UIWizardPage::setTitle(const QString &strTitle) -{ - m_strTitle = strTitle; - if (m_fReady) - QWizardPage::setTitle(m_strTitle); -} - -UIWizard *UIWizardPage::wizard() const -{ - return qobject_cast(QWizardPage::wizard()); -} - -void UIWizardPage::startProcessing() -{ - if (isFinalPage()) - wizard()->button(QWizard::FinishButton)->setEnabled(false); -} - -void UIWizardPage::endProcessing() -{ - if (isFinalPage()) - wizard()->button(QWizard::FinishButton)->setEnabled(true); -} Index: unk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.h (revision 91713) +++ (revision ) @@ -1,96 +1,0 @@ -/* $Id$ */ -/** @file - * VBox Qt GUI - UIWizardPage class declaration. - */ - -/* - * Copyright (C) 2009-2020 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 FEQT_INCLUDED_SRC_wizards_UIWizardPage_h -#define FEQT_INCLUDED_SRC_wizards_UIWizardPage_h -#ifndef RT_WITHOUT_PRAGMA_ONCE -# pragma once -#endif - -/* Qt includes: */ -#include -#include - -/* GUI includes: */ -#include "QIWithRetranslateUI.h" -#include "UILibraryDefs.h" - -/* Forward declarations: */ -class UIWizard; -class UIWizardPage; - - -/** One of two interfaces for wizard page. - * This is page-BASE providing access API for basic/expert pages. */ -class SHARED_LIBRARY_STUFF UIWizardPageBase -{ -public: - - /** Destructs wizard page-base. */ - virtual ~UIWizardPageBase() { /* Makes MSC happy. */ } - -protected: - - /** Returns wizard this page-base belongs to. */ - virtual UIWizard *wizardImp() const; - - /** Returns wizard page this page-base belongs to. */ - virtual UIWizardPage *thisImp(); - - /** Returns page field with certain @a strFieldName. */ - virtual QVariant fieldImp(const QString &strFieldName) const; -}; - - -/** One of two interfaces for wizard page. - * This is page-BODY based on QWizardPage with advanced functionality. */ -class SHARED_LIBRARY_STUFF UIWizardPage : public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - - /** Constructs wizard page. */ - UIWizardPage(); - - /** Redirects the translation call to actual handler. */ - void retranslate() { retranslateUi(); } - - /** Marks page ready. */ - void markReady(); - - /** Defines page @a strTitle. */ - void setTitle(const QString &strTitle); - -protected: - - /** Returns wizard this page belongs to. */ - UIWizard *wizard() const; - - /** Starts page processing. */ - void startProcessing(); - /** Ends page processing. */ - void endProcessing(); - - /** Holds whether page is ready. */ - bool m_fReady; - /** Holds the page title. */ - QString m_strTitle; -}; - - -#endif /* !FEQT_INCLUDED_SRC_wizards_UIWizardPage_h */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h (revision 91713) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.h (revision 91714) @@ -30,5 +30,5 @@ #include "CMediumFormat.h" -/** UIWizard subclass to clone virtual disk image files. */ +/** Clone Virtual Disk wizard: */ class UIWizardCloneVD : public UINativeWizard { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h (revision 91713) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.h (revision 91714) @@ -30,5 +30,5 @@ #include "CSnapshot.h" -/* Clone VM wizard: */ +/** Clone Virtual Machine wizard: */ class UIWizardCloneVM : public UINativeWizard { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 91713) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 91714) @@ -51,5 +51,6 @@ class UIWizardExportApp; -/** UIWizardPage extension for UIWizardExportAppVMs, UIWizardExportAppFormat and UIWizardExportAppSettings. */ +/** UINativeWizardPage extension for expert page of the Export Appliance wizard, + * based on UIWizardExportAppVMs, UIWizardExportAppFormat & UIWizardExportAppSettings namespace functions. */ class UIWizardExportAppPageExpert : public UINativeWizardPage { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h (revision 91713) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.h (revision 91714) @@ -30,5 +30,5 @@ #include "CMediumFormat.h" -/** New Virtual Hard Drive wizard. */ +/** New Virtual Disk wizard. */ class SHARED_LIBRARY_STUFF UIWizardNewVD : public UINativeWizard {