VirtualBox

Changeset 91272 in vbox


Ignore:
Timestamp:
Sep 16, 2021 7:48:28 AM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Refactoring disk variant widget.

Location:
trunk/src/VBox/Frontends/VirtualBox/src/wizards
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDExpertPage.cpp

    r91267 r91272  
    3232UIWizardCloneVDExpertPage::UIWizardCloneVDExpertPage(KDeviceType enmDeviceType, qulonglong uSourceDiskLogicaSize)
    3333    :m_pFormatGroupBox(0)
    34     , m_pVariantGroupBox(0)
     34    , m_pVariantWidget(0)
    3535    , m_pMediumSizePathGroupBox(0)
    3636    , m_enmDeviceType(enmDeviceType)
    … …  
    6464    }
    6565
    66     m_pVariantGroupBox = new UIDiskVariantGroupBox(true /* expert mode */, 0);
    67     if (m_pVariantGroupBox)
    68     {
    69         pMainLayout-> addWidget(m_pVariantGroupBox, 4, 1, 3, 1);
    70         connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
     66    m_pVariantWidget = new UIDiskVariantWidget(0);
     67    if (m_pVariantWidget)
     68    {
     69        pMainLayout-> addWidget(m_pVariantWidget, 4, 1, 3, 1);
     70        connect(m_pVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
    7171                this, &UIWizardCloneVDExpertPage::sltMediumVariantChanged);
    7272    }
    … …  
    129129void UIWizardCloneVDExpertPage::initializePage()
    130130{
    131     AssertReturnVoid(wizardWindow<UIWizardCloneVD>() && m_pMediumSizePathGroupBox && m_pFormatGroupBox && m_pVariantGroupBox);
     131    AssertReturnVoid(wizardWindow<UIWizardCloneVD>() && m_pMediumSizePathGroupBox && m_pFormatGroupBox && m_pVariantWidget);
    132132    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    133133
    134134    pWizard->setMediumFormat(m_pFormatGroupBox->mediumFormat());
    135135
    136     pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
    137     m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(pWizard->mediumFormat());
     136    pWizard->setMediumVariant(m_pVariantWidget->mediumVariant());
     137    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(pWizard->mediumFormat());
    138138
    139139    /* Initialize medium size widget and wizard's medium size parameter: */
    … …  
    146146    QString strDiskName = QString("%1_%2").arg(QFileInfo(pWizard->sourceDiskName()).completeBaseName()).arg(tr("copy"));
    147147    QString strMediumFilePath =
    148         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(strDiskName,
    149                                                                                              strExtension), strSourceDiskPath);
     148        UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskName,
     149                                                                                            strExtension), strSourceDiskPath);
    150150    m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);
    151151    pWizard->setMediumPath(strMediumFilePath);
    … …  
    162162    if (m_pFormatGroupBox)
    163163        fResult = m_pFormatGroupBox->mediumFormat().isNull();
    164     if (m_pVariantGroupBox)
    165         fResult = m_pVariantGroupBox->isComplete();
     164    if (m_pVariantWidget)
     165        fResult = m_pVariantWidget->isComplete();
    166166    if (m_pMediumSizePathGroupBox)
    167167        fResult =  m_pMediumSizePathGroupBox->isComplete();
    168168
    169     return fResult;
     169   return fResult;
    170170}
    171171
    … …  
    188188{
    189189    UIWizardCloneVD *pWizard = wizardWindow<UIWizardCloneVD>();
    190     AssertReturnVoid(pWizard && m_pVariantGroupBox && m_pMediumSizePathGroupBox && m_pFormatGroupBox);
     190    AssertReturnVoid(pWizard && m_pVariantWidget && m_pMediumSizePathGroupBox && m_pFormatGroupBox);
    191191    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
    192192    AssertReturnVoid(!comMediumFormat.isNull());
    193193
    194     m_pVariantGroupBox->blockSignals(true);
    195     m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
    196     m_pVariantGroupBox->blockSignals(false);
     194    m_pVariantWidget->blockSignals(true);
     195    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
     196    m_pVariantWidget->blockSignals(false);
    197197
    198198    m_pMediumSizePathGroupBox->blockSignals(true);
    … …  
    201201    /* Update the wizard parameters explicitly since we blocked th signals: */
    202202    pWizard->setMediumPath(m_pMediumSizePathGroupBox->mediumFilePath());
    203     pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
    204 }
     203    pWizard->setMediumVariant(m_pVariantWidget->mediumVariant());
     204}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDExpertPage.h

    r91062 r91272  
    3030/* Forward declarations: */
    3131class UIDiskFormatsGroupBox;
    32 class UIDiskVariantGroupBox;
     32class UIDiskVariantWidget;
    3333class UIMediumSizeAndPathGroupBox;
    3434
    … …  
    7777
    7878    UIDiskFormatsGroupBox *m_pFormatGroupBox;
    79     UIDiskVariantGroupBox *m_pVariantGroupBox;
     79    UIDiskVariantWidget *m_pVariantWidget;
    8080    UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroupBox;
    8181    KDeviceType m_enmDeviceType;

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPathSizePage.cpp

    r91267 r91272  
    7979
    8080        QString strMediumFilePath =
    81             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(strDiskName,
    82                                                                                                  strExtension), strSourceDiskPath);
     81            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(strDiskName,
     82                                                                                                strExtension), strSourceDiskPath);
    8383        m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);
    8484        pWizard->setMediumPath(strMediumFilePath);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDVariantPage.cpp

    r91062 r91272  
    3333    , m_pFixedLabel(0)
    3434    , m_pSplitLabel(0)
    35     , m_pVariantGroupBox(0)
     35    , m_pVariantWidget(0)
    3636{
    3737    prepare();
    … …  
    5858        pMainLayout->addWidget(m_pSplitLabel);
    5959
    60     m_pVariantGroupBox = new UIDiskVariantGroupBox(false /* expert mode */, 0);
    61     if (m_pVariantGroupBox)
     60    m_pVariantWidget = new UIDiskVariantWidget(0);
     61    if (m_pVariantWidget)
    6262    {
    63         pMainLayout->addWidget(m_pVariantGroupBox);
    64         connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
     63        pMainLayout->addWidget(m_pVariantWidget);
     64        connect(m_pVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
    6565                this, &UIWizardCloneVDVariantPage::sltMediumVariantChanged);
    6666
    … …  
    9696
    9797    setWidgetVisibility(wizardWindow<UIWizardCloneVD>()->mediumFormat());
    98     if (m_pVariantGroupBox)
    99         wizardWindow<UIWizardCloneVD>()->setMediumVariant(m_pVariantGroupBox->mediumVariant());
     98    if (m_pVariantWidget)
     99        wizardWindow<UIWizardCloneVD>()->setMediumVariant(m_pVariantWidget->mediumVariant());
    100100}
    101101
    102102bool UIWizardCloneVDVariantPage::isComplete() const
    103103{
    104     AssertReturn(m_pVariantGroupBox, false);
    105     return m_pVariantGroupBox->isComplete();
     104    AssertReturn(m_pVariantWidget, false);
     105    return m_pVariantWidget->isComplete();
    106106}
    107107
    108108void UIWizardCloneVDVariantPage::setWidgetVisibility(const CMediumFormat &mediumFormat)
    109109{
    110     AssertReturnVoid(m_pVariantGroupBox);
     110    AssertReturnVoid(m_pVariantWidget);
    111111
    112     m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
     112    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
    113113
    114114    if (m_pDynamicLabel)
    115         m_pDynamicLabel->setHidden(!m_pVariantGroupBox->isCreateDynamicPossible());
     115        m_pDynamicLabel->setHidden(!m_pVariantWidget->isCreateDynamicPossible());
    116116    if (m_pFixedLabel)
    117         m_pFixedLabel->setHidden(!m_pVariantGroupBox->isCreateFixedPossible());
     117        m_pFixedLabel->setHidden(!m_pVariantWidget->isCreateFixedPossible());
    118118    if (m_pSplitLabel)
    119         m_pSplitLabel->setHidden(!m_pVariantGroupBox->isCreateSplitPossible());
     119        m_pSplitLabel->setHidden(!m_pVariantWidget->isCreateSplitPossible());
    120120}
    121121

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDVariantPage.h

    r91062 r91272  
    2828class QIRichTextLabel;
    2929class CMediumFormat;
    30 class UIDiskVariantGroupBox;
     30class UIDiskVariantWidget;
    3131
    3232class UIWizardCloneVDVariantPage : public UINativeWizardPage
    … …  
    6464    /** Holds the 'Split to 2GB files' description label instance. */
    6565    QIRichTextLabel *m_pSplitLabel;
    66     UIDiskVariantGroupBox *m_pVariantGroupBox;
     66    UIDiskVariantWidget *m_pVariantWidget;
    6767};
    6868

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

    r91267 r91272  
    168168
    169169/*********************************************************************************************************************************
    170 *   UIDiskVariantGroupBox implementation.                                                                                   *
     170*   UIDiskVariantWidget implementation.                                                                                   *
    171171*********************************************************************************************************************************/
    172172
    173173
    174 UIDiskVariantGroupBox::UIDiskVariantGroupBox(bool fExpertMode, QWidget *pParent /* = 0 */)
    175     : UIDiskEditorGroupBox(fExpertMode, pParent)
     174UIDiskVariantWidget::UIDiskVariantWidget(QWidget *pParent /* = 0 */)
     175    : QIWithRetranslateUI<QWidget>(pParent)
    176176    , m_pFixedCheckBox(0)
    177177    , m_pSplitBox(0)
    … …  
    180180}
    181181
    182 void UIDiskVariantGroupBox::prepare()
     182void UIDiskVariantWidget::prepare()
    183183{
    184184    QVBoxLayout *pVariantLayout = new QVBoxLayout(this);
    … …  
    186186    m_pFixedCheckBox = new QCheckBox;
    187187    m_pSplitBox = new QCheckBox;
    188     connect(m_pFixedCheckBox, &QCheckBox::toggled, this, &UIDiskVariantGroupBox::sltVariantChanged);
    189     connect(m_pSplitBox, &QCheckBox::toggled, this, &UIDiskVariantGroupBox::sltVariantChanged);
     188    connect(m_pFixedCheckBox, &QCheckBox::toggled, this, &UIDiskVariantWidget::sltVariantChanged);
     189    connect(m_pSplitBox, &QCheckBox::toggled, this, &UIDiskVariantWidget::sltVariantChanged);
    190190    pVariantLayout->addWidget(m_pFixedCheckBox);
    191191    pVariantLayout->addWidget(m_pSplitBox);
    … …  
    194194}
    195195
    196 void UIDiskVariantGroupBox::retranslateUi()
    197 {
    198     if (m_fExpertMode)
    199         setTitle(tr("Storage on Physical Hard Disk"));
     196void UIDiskVariantWidget::retranslateUi()
     197{
    200198    if (m_pFixedCheckBox)
    201199    {
    … …  
    210208}
    211209
    212 qulonglong UIDiskVariantGroupBox::mediumVariant() const
     210qulonglong UIDiskVariantWidget::mediumVariant() const
    213211{
    214212    /* Initial value: */
    … …  
    229227}
    230228
    231 void UIDiskVariantGroupBox::setMediumVariant(qulonglong uMediumVariant)
     229void UIDiskVariantWidget::setMediumVariant(qulonglong uMediumVariant)
    232230{
    233231    /* Exclusive options: */
    … …  
    242240}
    243241
    244 void UIDiskVariantGroupBox::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
     242void UIDiskVariantWidget::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
    245243{
    246244    AssertReturnVoid(m_pFixedCheckBox && m_pSplitBox);
    … …  
    273271}
    274272
    275 bool UIDiskVariantGroupBox::isComplete() const
     273bool UIDiskVariantWidget::isComplete() const
    276274{
    277275    /* Make sure medium variant is correct: */
    … …  
    279277}
    280278
    281 bool UIDiskVariantGroupBox::isCreateDynamicPossible() const
     279bool UIDiskVariantWidget::isCreateDynamicPossible() const
    282280{
    283281    return m_fIsCreateDynamicPossible;
    284282}
    285283
    286 bool UIDiskVariantGroupBox::isCreateFixedPossible() const
     284bool UIDiskVariantWidget::isCreateFixedPossible() const
    287285{
    288286    return m_fIsCreateFixedPossible;
    289287}
    290288
    291 bool UIDiskVariantGroupBox::isCreateSplitPossible() const
     289bool UIDiskVariantWidget::isCreateSplitPossible() const
    292290{
    293291    return m_fIsCreateSplitPossible;
    294292}
    295293
    296 void UIDiskVariantGroupBox::sltVariantChanged()
     294void UIDiskVariantWidget::sltVariantChanged()
    297295{
    298296    emit sigMediumVariantChanged(mediumVariant());

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

    r91267 r91272  
    7676
    7777
    78 class SHARED_LIBRARY_STUFF UIDiskVariantGroupBox : public UIDiskEditorGroupBox
     78class SHARED_LIBRARY_STUFF UIDiskVariantWidget : public QIWithRetranslateUI<QWidget>
    7979{
    8080    Q_OBJECT;
    … …  
    8686public:
    8787
    88     UIDiskVariantGroupBox(bool fExpertMode, QWidget *pParent = 0);
     88    UIDiskVariantWidget(QWidget *pParent = 0);
    8989    /** Enable/disable medium variant radio button depending on the capabilities of the medium format. */
    9090    void updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDExpertPage.cpp

    r91267 r91272  
    3333    : UINativeWizardPage()
    3434    , m_pSizeAndPathGroup(0)
    35     , m_pFormatGroup(0)
    36     , m_pVariantGroup(0)
     35    , m_pFormatComboxBox(0)
     36    , m_pVariantWidget(0)
    3737    , m_strDefaultName(strDefaultName)
    3838    , m_strDefaultPath(strDefaultPath)
    … …  
    4848    QGridLayout *pMainLayout = new QGridLayout(this);
    4949    m_pSizeAndPathGroup = new UIMediumSizeAndPathGroupBox(true /* fExpertMode */, 0 /* parent */, _4M /* minimum size */);
    50     m_pFormatGroup = new UIDiskFormatsGroupBox(true /* fExpertMode */, KDeviceType_HardDisk, 0);
    51     m_pVariantGroup = new UIDiskVariantGroupBox(true /* fExpertMode */, 0);
     50    m_pFormatComboxBox = new UIDiskFormatsGroupBox(true /* fExpertMode */, KDeviceType_HardDisk, 0);
     51    m_pVariantWidget = new UIDiskVariantWidget(0);
    5252
    5353    pMainLayout->addWidget(m_pSizeAndPathGroup, 0, 0, 4, 2);
    54     pMainLayout->addWidget(m_pFormatGroup, 4, 0, 7, 1);
    55     pMainLayout->addWidget(m_pVariantGroup, 4, 1, 3, 1);
    56 
    57     connect(m_pFormatGroup, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
     54    pMainLayout->addWidget(m_pFormatComboxBox, 4, 0, 7, 1);
     55    pMainLayout->addWidget(m_pVariantWidget, 4, 1, 3, 1);
     56
     57    connect(m_pFormatComboxBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
    5858            this, &UIWizardNewVDExpertPage::sltMediumFormatChanged);
    59     connect(m_pVariantGroup, &UIDiskVariantGroupBox::sigMediumVariantChanged,
     59    connect(m_pVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
    6060            this, &UIWizardNewVDExpertPage::sltMediumVariantChanged);
    6161    connect(m_pSizeAndPathGroup, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
    … …  
    9696void UIWizardNewVDExpertPage::sltMediumFormatChanged()
    9797{
    98     AssertReturnVoid(m_pFormatGroup);
     98    AssertReturnVoid(m_pFormatComboxBox);
    9999    AssertReturnVoid(wizardWindow<UIWizardNewVD>());
    100     wizardWindow<UIWizardNewVD>()->setMediumFormat(m_pFormatGroup->mediumFormat());
     100    wizardWindow<UIWizardNewVD>()->setMediumFormat(m_pFormatComboxBox->mediumFormat());
    101101    updateDiskWidgetsAfterMediumFormatChange();
    102102    completeChanged();
    … …  
    130130    AssertReturnVoid(pWizard);
    131131    /* First set the medium format of the wizard: */
    132     AssertReturnVoid(m_pFormatGroup);
    133     const CMediumFormat &comMediumFormat = m_pFormatGroup->mediumFormat();
     132    AssertReturnVoid(m_pFormatComboxBox);
     133    const CMediumFormat &comMediumFormat = m_pFormatComboxBox->mediumFormat();
    134134    AssertReturnVoid(!comMediumFormat.isNull());
    135135    pWizard->setMediumFormat(comMediumFormat);
    … …  
    137137    QString strExtension = UIDiskEditorGroupBox::defaultExtension(comMediumFormat, KDeviceType_HardDisk);
    138138    QString strMediumFilePath =
    139         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
    140                                                                                              strExtension), m_strDefaultPath);
     139        UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_strDefaultName,
     140                                                                                            strExtension), m_strDefaultPath);
    141141    m_pSizeAndPathGroup->blockSignals(true);
    142142    m_pSizeAndPathGroup->setMediumFilePath(strMediumFilePath);
    … …  
    149149    pWizard->setMediumSize(m_pSizeAndPathGroup->mediumSize());
    150150
    151     m_pVariantGroup->blockSignals(true);
    152     m_pVariantGroup->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
    153     m_pVariantGroup->blockSignals(false);
    154 
    155     pWizard->setMediumVariant(m_pVariantGroup->mediumVariant());
     151    m_pVariantWidget->blockSignals(true);
     152    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
     153    m_pVariantWidget->blockSignals(false);
     154
     155    pWizard->setMediumVariant(m_pVariantWidget->mediumVariant());
    156156
    157157    retranslateUi();
    … …  
    204204{
    205205    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    206     AssertReturnVoid(pWizard && m_pVariantGroup && m_pSizeAndPathGroup && m_pFormatGroup);
     206    AssertReturnVoid(pWizard && m_pVariantWidget && m_pSizeAndPathGroup && m_pFormatComboxBox);
    207207    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
    208208    AssertReturnVoid(!comMediumFormat.isNull());
    209209
    210     m_pVariantGroup->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
    211     m_pSizeAndPathGroup->updateMediumPath(comMediumFormat, m_pFormatGroup->formatExtensions(), KDeviceType_HardDisk);
    212 }
     210    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
     211    m_pSizeAndPathGroup->updateMediumPath(comMediumFormat, m_pFormatComboxBox->formatExtensions(), KDeviceType_HardDisk);
     212}

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDExpertPage.h

    r91061 r91272  
    2727/* Forward declarations: */
    2828class UIDiskFormatsGroupBox;
    29 class UIDiskVariantGroupBox;
     29class UIDiskVariantWidget;
    3030class UIMediumSizeAndPathGroupBox;
    3131
    … …  
    6161    void updateDiskWidgetsAfterMediumFormatChange();
    6262
    63    /** @name Widget
     63   /** @name Widgets
    6464     * @{ */
    6565       UIMediumSizeAndPathGroupBox *m_pSizeAndPathGroup;
    66        UIDiskFormatsGroupBox *m_pFormatGroup;
    67        UIDiskVariantGroupBox *m_pVariantGroup;
     66       UIDiskFormatsGroupBox *m_pFormatComboxBox;
     67       UIDiskVariantWidget *m_pVariantWidget;
    6868   /** @} */
    6969

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDSizeLocationPage.cpp

    r91269 r91272  
    110110    if (!m_userModifiedParameters.contains("MediumPath"))
    111111        strMediumFilePath =
    112             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
    113                                                                                                  strExtension), m_strDefaultPath);
     112            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_strDefaultName,
     113                                                                                                strExtension), m_strDefaultPath);
    114114    /* Initialize the medium file path with file path and file name from the location editor. This part is to update the
    115115     * file extention correctly in case user has gone back and changed the file format after modifying medium file path: */
    116116    else
    117117        strMediumFilePath =
    118             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_pMediumSizePathGroup->mediumName(),
    119                                                                                                  strExtension), m_pMediumSizePathGroup->mediumPath());
     118            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskEditorGroupBox::appendExtension(m_pMediumSizePathGroup->mediumName(),
     119                                                                                                strExtension), m_pMediumSizePathGroup->mediumPath());
    120120    m_pMediumSizePathGroup->blockSignals(true);
    121121    m_pMediumSizePathGroup->setMediumFilePath(strMediumFilePath);

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDVariantPage.cpp

    r91061 r91272  
    3333    , m_pFixedLabel(0)
    3434    , m_pSplitLabel(0)
    35     , m_pVariantGroupBox(0)
     35    , m_pVariantWidget(0)
    3636{
    3737    prepare();
    … …  
    5353    pMainLayout->addWidget(m_pSplitLabel);
    5454
    55     m_pVariantGroupBox = new UIDiskVariantGroupBox(false, 0);
    56     pMainLayout->addWidget(m_pVariantGroupBox);
     55    m_pVariantWidget = new UIDiskVariantWidget(0);
     56    pMainLayout->addWidget(m_pVariantWidget);
    5757    pMainLayout->addStretch();
    5858
    59     connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
     59    connect(m_pVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
    6060            this, &UIWizardNewVDVariantPage::sltMediumVariantChanged);
    6161    retranslateUi();
    … …  
    8686{
    8787    UIWizardNewVD *pWizard = wizardWindow<UIWizardNewVD>();
    88     AssertReturnVoid(pWizard && m_pVariantGroupBox);
     88    AssertReturnVoid(pWizard && m_pVariantWidget);
    8989    setWidgetVisibility(pWizard->mediumFormat());
    90     pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
     90    pWizard->setMediumVariant(m_pVariantWidget->mediumVariant());
    9191    retranslateUi();
    9292}
    … …  
    9494bool UIWizardNewVDVariantPage::isComplete() const
    9595{
    96     if (m_pVariantGroupBox && m_pVariantGroupBox->mediumVariant() != (qulonglong)KMediumVariant_Max)
     96    if (m_pVariantWidget && m_pVariantWidget->mediumVariant() != (qulonglong)KMediumVariant_Max)
    9797        return true;
    9898    return false;
    … …  
    101101void UIWizardNewVDVariantPage::setWidgetVisibility(const CMediumFormat &mediumFormat)
    102102{
    103     AssertReturnVoid(m_pVariantGroupBox);
    104     m_pVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
     103    AssertReturnVoid(m_pVariantWidget);
     104    m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(mediumFormat);
    105105    if (m_pDynamicLabel)
    106         m_pDynamicLabel->setHidden(!m_pVariantGroupBox->isCreateDynamicPossible());
     106        m_pDynamicLabel->setHidden(!m_pVariantWidget->isCreateDynamicPossible());
    107107    if (m_pFixedLabel)
    108         m_pFixedLabel->setHidden(!m_pVariantGroupBox->isCreateFixedPossible());
     108        m_pFixedLabel->setHidden(!m_pVariantWidget->isCreateFixedPossible());
    109109    if (m_pSplitLabel)
    110         m_pSplitLabel->setHidden(!m_pVariantGroupBox->isCreateSplitPossible());
     110        m_pSplitLabel->setHidden(!m_pVariantWidget->isCreateSplitPossible());
    111111}
    112112

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDVariantPage.h

    r91061 r91272  
    2828class CMediumFormat;
    2929class QIRichTextLabel;
    30 class UIDiskVariantGroupBox;
     30class UIDiskVariantWidget;
    3131
    3232class SHARED_LIBRARY_STUFF UIWizardNewVDVariantPage : public UINativeWizardPage
    … …  
    5454    QIRichTextLabel *m_pFixedLabel;
    5555    QIRichTextLabel *m_pSplitLabel;
    56     UIDiskVariantGroupBox *m_pVariantGroupBox;
     56    UIDiskVariantWidget *m_pVariantWidget;
    5757};
    5858

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

    r91267 r91272  
    4343UIWizardNewVMExpertPage::UIWizardNewVMExpertPage()
    4444    : m_pToolBox(0)
    45     , m_pDiskVariantGroupBox(0)
     45    , m_pDiskVariantWidget(0)
    4646    , m_pFormatComboBox(0)
    4747    , m_pSizeAndLocationGroup(0)
    … …  
    296296                this, &UIWizardNewVMExpertPage::sltMediumFormatChanged);
    297297
    298     if (m_pDiskVariantGroupBox)
    299         connect(m_pDiskVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
     298    if (m_pDiskVariantWidget)
     299        connect(m_pDiskVariantWidget, &UIDiskVariantWidget::sigMediumVariantChanged,
    300300                this, &UIWizardNewVMExpertPage::sltMediumVariantChanged);
    301301}
    … …  
    450450    m_pFormatComboBox = new UIDiskFormatsComboBox(true, KDeviceType_HardDisk, 0);
    451451    pDiskContainerLayout->addWidget(m_pFormatComboBox, 2, 0, 1, 1);
    452     m_pDiskVariantGroupBox  = new UIDiskVariantGroupBox(true, 0);
    453     pDiskContainerLayout->addWidget(m_pDiskVariantGroupBox, 2, 1, 2, 1);
     452    m_pDiskVariantWidget  = new UIDiskVariantWidget(0);
     453    pDiskContainerLayout->addWidget(m_pDiskVariantWidget, 2, 1, 2, 1);
    454454    return pNewDiskContainerWidget;
    455455}
    … …  
    823823{
    824824    UIWizardNewVM *pWizard = wizardWindow<UIWizardNewVM>();
    825     AssertReturnVoid(pWizard && m_pDiskVariantGroupBox && m_pSizeAndLocationGroup && m_pFormatComboBox);
     825    AssertReturnVoid(pWizard && m_pDiskVariantWidget && m_pSizeAndLocationGroup && m_pFormatComboBox);
    826826    const CMediumFormat &comMediumFormat = pWizard->mediumFormat();
    827827    AssertReturnVoid(!comMediumFormat.isNull());
    828828
    829829    /* Block signals of the updated widgets to avoid calling corresponding slots since they add the parameters to m_userModifiedParameters: */
    830     m_pDiskVariantGroupBox->blockSignals(true);
    831     m_pDiskVariantGroupBox->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
    832     m_pDiskVariantGroupBox->blockSignals(false);
     830    m_pDiskVariantWidget->blockSignals(true);
     831    m_pDiskVariantWidget->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
     832    m_pDiskVariantWidget->blockSignals(false);
    833833
    834834    m_pSizeAndLocationGroup->blockSignals(true);
    … …  
    837837    /* Update the wizard parameters explicitly since we blocked th signals: */
    838838    pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumFilePath());
    839     pWizard->setMediumVariant(m_pDiskVariantGroupBox->mediumVariant());
     839    pWizard->setMediumVariant(m_pDiskVariantWidget->mediumVariant());
    840840}
    841841
    … …  
    846846    if (m_pFormatComboBox)
    847847        m_pFormatComboBox->setEnabled(fEnable);
    848     if (m_pDiskVariantGroupBox)
    849         m_pDiskVariantGroupBox->setEnabled(fEnable);
     848    if (m_pDiskVariantWidget)
     849        m_pDiskVariantWidget->setEnabled(fEnable);
    850850}
    851851

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.h

    r91257 r91272  
    3636class UIAdditionalUnattendedOptions;
    3737class UIDiskFormatsComboBox;
    38 class UIDiskVariantGroupBox;
     38class UIDiskVariantWidget;
    3939class UIMediumSizeAndPathGroupBox;
    4040class UIGAInstallationGroupBox;
    … …  
    126126      * @{ */
    127127        UIToolBox  *m_pToolBox;
    128         UIDiskVariantGroupBox *m_pDiskVariantGroupBox;
     128        UIDiskVariantWidget *m_pDiskVariantWidget;
    129129        UIDiskFormatsComboBox *m_pFormatComboBox;
    130130        UIMediumSizeAndPathGroupBox *m_pSizeAndLocationGroup;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette