VirtualBox

Ignore:
Timestamp:
Apr 20, 2021 8:16:05 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
143900
Message:

FE/Qt: bugref:9996. Renaming page 2 of the new vd wizard

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r88597 r88598  
    910910        src/wizards/newvd/UIWizardNewVD.h \
    911911        src/wizards/newvd/UIWizardNewVDPageFileType.h \
    912         src/wizards/newvd/UIWizardNewVDPageBasic2.h \
     912        src/wizards/newvd/UIWizardNewVDPageVariant.h \
    913913        src/wizards/newvd/UIWizardNewVDPageBasic3.h \
    914914        src/wizards/newvd/UIWizardNewVDPageExpert.h
    … …  
    14481448        src/wizards/newvd/UIWizardNewVD.cpp \
    14491449        src/wizards/newvd/UIWizardNewVDPageFileType.cpp \
    1450         src/wizards/newvd/UIWizardNewVDPageBasic2.cpp \
     1450        src/wizards/newvd/UIWizardNewVDPageVariant.cpp \
    14511451        src/wizards/newvd/UIWizardNewVDPageBasic3.cpp \
    14521452        src/wizards/newvd/UIWizardNewVDPageExpert.cpp

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

    r88597 r88598  
    2323#include "UIWizardNewVD.h"
    2424#include "UIWizardNewVDPageFileType.h"
    25 #include "UIWizardNewVDPageBasic2.h"
     25#include "UIWizardNewVDPageVariant.h"
    2626#include "UIWizardNewVDPageBasic3.h"
    2727#include "UIWizardNewVDPageExpert.h"
    … …  
    127127        {
    128128            setPage(Page1, new UIWizardNewVDPageFileType);
    129             setPage(Page2, new UIWizardNewVDPageBasic2);
     129            setPage(Page2, new UIWizardNewVDPageVariant);
    130130            setPage(Page3, new UIWizardNewVDPageBasic3(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
    131131            break;

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

    r88597 r88598  
    154154{
    155155    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    156     UIWizardNewVDPage2::retranslateWidgets();
     156    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    157157    UIWizardNewVDPage3::retranslateWidgets();
    158158    /* Translate widgets: */

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

    r88597 r88598  
    2424/* GUI includes: */
    2525#include "UIWizardNewVDPageFileType.h"
    26 #include "UIWizardNewVDPageBasic2.h"
     26#include "UIWizardNewVDPageVariant.h"
    2727#include "UIWizardNewVDPageBasic3.h"
    2828
    … …  
    3333class SHARED_LIBRARY_STUFF UIWizardNewVDPageExpert : public UIWizardPage,
    3434                                                     public UIWizardNewVDPageBaseFileType,
    35                                                      public UIWizardNewVDPage2,
     35                                                     public UIWizardNewVDPageBaseVariant,
    3636                                                     public UIWizardNewVDPage3
    3737{

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

    r88597 r88598  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic2 class implementation.
     3 * VBox Qt GUI - UIWizardNewVDPageVariant class implementation.
    44 */
    55
    … …  
    2323
    2424/* GUI includes: */
    25 #include "UIWizardNewVDPageBasic2.h"
     25#include "UIWizardNewVDPageVariant.h"
    2626#include "UIWizardNewVD.h"
    2727#include "QIRichTextLabel.h"
    … …  
    3030#include "CMediumFormat.h"
    3131
    32 UIWizardNewVDPage2::UIWizardNewVDPage2()
     32UIWizardNewVDPageBaseVariant::UIWizardNewVDPageBaseVariant()
    3333    : m_pFixedCheckBox(0)
    3434    , m_pSplitBox(0)
    … …  
    4040}
    4141
    42 QWidget *UIWizardNewVDPage2::createMediumVariantWidgets(bool fWithLabels)
     42QWidget *UIWizardNewVDPageBaseVariant::createMediumVariantWidgets(bool fWithLabels)
    4343{
    4444    QWidget *pContainerWidget = new QWidget;
    … …  
    7575}
    7676
    77 qulonglong UIWizardNewVDPage2::mediumVariant() const
     77qulonglong UIWizardNewVDPageBaseVariant::mediumVariant() const
    7878{
    7979    /* Initial value: */
    … …  
    9494}
    9595
    96 void UIWizardNewVDPage2::setMediumVariant(qulonglong uMediumVariant)
     96void UIWizardNewVDPageBaseVariant::setMediumVariant(qulonglong uMediumVariant)
    9797{
    9898    /* Exclusive options: */
    … …  
    107107}
    108108
    109 void UIWizardNewVDPage2::retranslateWidgets()
     109void UIWizardNewVDPageBaseVariant::retranslateWidgets()
    110110{
    111111    if (m_pFixedCheckBox)
    … …  
    138138}
    139139
    140 void UIWizardNewVDPage2::setWidgetVisibility(CMediumFormat &mediumFormat)
     140void UIWizardNewVDPageBaseVariant::setWidgetVisibility(CMediumFormat &mediumFormat)
    141141{
    142142    ULONG uCapabilities = 0;
    … …  
    174174}
    175175
    176 void UIWizardNewVDPage2::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
     176void UIWizardNewVDPageBaseVariant::updateMediumVariantWidgetsAfterFormatChange(const CMediumFormat &mediumFormat)
    177177{
    178178    /* Enable/disable widgets: */
    … …  
    198198}
    199199
    200 UIWizardNewVDPageBasic2::UIWizardNewVDPageBasic2()
     200UIWizardNewVDPageVariant::UIWizardNewVDPageVariant()
    201201{
    202202    /* Create widgets: */
    … …  
    207207    /* Setup connections: */
    208208    connect(m_pFixedCheckBox, &QAbstractButton::toggled,
    209             this, &UIWizardNewVDPageBasic2::completeChanged);
     209            this, &UIWizardNewVDPageVariant::completeChanged);
    210210    connect(m_pSplitBox, &QCheckBox::stateChanged,
    211             this, &UIWizardNewVDPageBasic2::completeChanged);
     211            this, &UIWizardNewVDPageVariant::completeChanged);
    212212
    213213    /* Register fields: */
    … …  
    215215}
    216216
    217 void UIWizardNewVDPageBasic2::retranslateUi()
     217void UIWizardNewVDPageVariant::retranslateUi()
    218218{
    219219    retranslateWidgets();
    … …  
    222222}
    223223
    224 void UIWizardNewVDPageBasic2::initializePage()
     224void UIWizardNewVDPageVariant::initializePage()
    225225{
    226226    /* Translate page: */
    … …  
    230230}
    231231
    232 bool UIWizardNewVDPageBasic2::isComplete() const
     232bool UIWizardNewVDPageVariant::isComplete() const
    233233{
    234234    /* Make sure medium variant is correct: */

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

    r88597 r88598  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic2 class declaration.
     3 * VBox Qt GUI - UIWizardNewVDPageVariant class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic2_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic2_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageVariant_h
     19#define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageVariant_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3333
    3434/* 2nd page of the New Virtual Hard Drive wizard (base part): */
    35 class SHARED_LIBRARY_STUFF UIWizardNewVDPage2 : public UIWizardPageBase
     35class SHARED_LIBRARY_STUFF UIWizardNewVDPageBaseVariant : public UIWizardPageBase
    3636{
    3737protected:
    3838
    3939    /** Constructor: */
    40     UIWizardNewVDPage2();
     40    UIWizardNewVDPageBaseVariant();
    4141
    4242    QWidget *createMediumVariantWidgets(bool fWithLabels);
    … …  
    6363
    6464/* 2nd page of the New Virtual Hard Drive wizard (basic extension): */
    65 class SHARED_LIBRARY_STUFF UIWizardNewVDPageBasic2 : public UIWizardPage, public UIWizardNewVDPage2
     65class SHARED_LIBRARY_STUFF UIWizardNewVDPageVariant : public UIWizardPage, public UIWizardNewVDPageBaseVariant
    6666{
    6767    Q_OBJECT;
    … …  
    7070public:
    7171
    72     UIWizardNewVDPageBasic2();
     72    UIWizardNewVDPageVariant();
    7373
    7474private:
    … …  
    8080
    8181
    82 #endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic2_h */
     82#endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageVariant_h */

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

    r88597 r88598  
    310310    UIWizardNewVMPageDiskBase::retranslateWidgets();
    311311    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    312     UIWizardNewVDPage2::retranslateWidgets();
     312    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    313313    UIWizardNewVDPage3::retranslateWidgets();
    314314}

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

    r88597 r88598  
    2828#include "UIWizardPage.h"
    2929#include "UIWizardNewVDPageFileType.h"
    30 #include "UIWizardNewVDPageBasic2.h"
     30#include "UIWizardNewVDPageVariant.h"
    3131#include "UIWizardNewVDPageBasic3.h"
    3232#include "UIWizardNewVM.h"
    … …  
    8181                                public UIWizardNewVMPageDiskBase,
    8282                                public UIWizardNewVDPageBaseFileType,
    83                                 public UIWizardNewVDPage2,
     83                                public UIWizardNewVDPageBaseVariant,
    8484                                public UIWizardNewVDPage3
    8585{

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

    r88597 r88598  
    159159    UIWizardNewVMPageDiskBase::retranslateWidgets();
    160160    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    161     UIWizardNewVDPage2::retranslateWidgets();
     161    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    162162    UIWizardNewVDPage3::retranslateWidgets();
    163163

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

    r88597 r88598  
    4343                                public UIWizardNewVMPageDiskBase,
    4444                                public UIWizardNewVDPageBaseFileType,
    45                                 public UIWizardNewVDPage2,
     45                                public UIWizardNewVDPageBaseVariant,
    4646                                public UIWizardNewVDPage3
    4747{
Note: See TracChangeset for help on using the changeset viewer.

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