VirtualBox

Changeset 90827 in vbox for trunk/src


Ignore:
Timestamp:
Aug 24, 2021 8:50:46 AM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Renaming and cleaning clone vd classes.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
5 edited
6 moved

Legend:

Unmodified
Added
Removed

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

    r90739 r90827  
    671671        src/wizards/clonevm/UIWizardCloneVMPageExpert.h \
    672672        src/wizards/clonevd/UIWizardCloneVD.h \
    673         src/wizards/clonevd/UIWizardCloneVDPageBasic1.h \
    674         src/wizards/clonevd/UIWizardCloneVDPageBasic2.h \
    675         src/wizards/clonevd/UIWizardCloneVDPageBasic3.h \
     673        src/wizards/clonevd/UIWizardCloneVDPageFormat.h \
     674        src/wizards/clonevd/UIWizardCloneVDPageVariant.h \
     675        src/wizards/clonevd/UIWizardCloneVDPagePathSize.h \
    676676        src/wizards/clonevd/UIWizardCloneVDPageExpert.h \
    677677        src/wizards/exportappliance/UIWizardExportApp.h \
    … …  
    11781178        src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp \
    11791179        src/wizards/clonevd/UIWizardCloneVD.cpp \
    1180         src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp \
    1181         src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp \
    1182         src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp \
     1180        src/wizards/clonevd/UIWizardCloneVDPageFormat.cpp \
     1181        src/wizards/clonevd/UIWizardCloneVDPageVariant.cpp \
     1182        src/wizards/clonevd/UIWizardCloneVDPagePathSize.cpp \
    11831183        src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp \
    11841184        src/wizards/exportappliance/UIWizardExportApp.cpp \

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

    r90800 r90827  
    2222#include "UINotificationCenter.h"
    2323#include "UIWizardCloneVD.h"
    24 #include "UIWizardCloneVDPageBasic1.h"
    25 #include "UIWizardCloneVDPageBasic2.h"
    26 #include "UIWizardCloneVDPageBasic3.h"
     24#include "UIWizardCloneVDPageFormat.h"
     25#include "UIWizardCloneVDPageVariant.h"
     26#include "UIWizardCloneVDPagePathSize.h"
    2727#include "UIWizardCloneVDPageExpert.h"
    2828
    2929/* COM includes: */
    3030#include "CMediumFormat.h"
    31 
    3231
    3332UIWizardCloneVD::UIWizardCloneVD(QWidget *pParent, const CMedium &comSourceVirtualDisk)
    … …  
    104103
    105104            {
    106             addPage(new UIWizardCloneVDPageBasic1(m_enmDeviceType));
    107             m_iMediumVariantPageIndex = addPage(new UIWizardCloneVDPageBasic2(m_enmDeviceType));
    108             addPage(new UIWizardCloneVDPageBasic3(sourceDiskLogicalSize()));
     105            addPage(new UIWizardCloneVDPageFormat(m_enmDeviceType));
     106            m_iMediumVariantPageIndex = addPage(new UIWizardCloneVDPageVariant(m_enmDeviceType));
     107            addPage(new UIWizardCloneVDPagePathSize(sourceDiskLogicalSize()));
    109108            break;
    110109        }

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

    r90761 r90827  
    2929#include "CMedium.h"
    3030#include "CMediumFormat.h"
    31 
    3231
    3332/** UIWizard subclass to clone virtual disk image files. */

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

    r90826 r90827  
    2121
    2222/* GUI includes: */
    23 #include "QIToolButton.h"
    2423#include "UICommon.h"
    25 #include "UIConverter.h"
    26 #include "UIIconPool.h"
    2724#include "UIMessageCenter.h"
    2825#include "UIWizardCloneVD.h"
    … …  
    3229/* COM includes: */
    3330#include "CSystemProperties.h"
    34 
    3531
    3632UIWizardCloneVDPageExpert::UIWizardCloneVDPageExpert(KDeviceType enmDeviceType, qulonglong uSourceDiskLogicaSize)
    … …  
    128124void UIWizardCloneVDPageExpert::retranslateUi()
    129125{
    130 
    131126}
    132127

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

    r90826 r90827  
    2424/* GUI includes: */
    2525#include "UINativeWizardPage.h"
    26 #include "UIWizardCloneVDPageBasic3.h"
     26
     27/* COM includes: */
     28#include "COMEnums.h"
    2729
    2830/* Forward declarations: */
    … …  
    3032class UIDiskVariantGroupBox;
    3133class UIMediumSizeAndPathGroupBox;
    32 
     34class UIWizardCloneVD;
    3335
    3436/** Expert page of the Clone Virtual Disk Image wizard: */
    … …  
    3941public:
    4042
    41     /** Constructs basic page.
     43    /** Constructs the page.
    4244      * @param  comSourceVirtualDisk  Brings the initial source disk to make copy from.
    4345      * @param  enmDeviceType         Brings the device type to limit format to. */
    … …  
    7577    UIWizardCloneVD *cloneWizard();
    7678
    77 
    78 
    7979    UIDiskFormatsGroupBox *m_pFormatGroupBox;
    8080    UIDiskVariantGroupBox *m_pVariantGroupBox;
    8181    UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroupBox;
    82 
    83 
    8482};
    8583

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic1 class implementation.
     3 * VBox Qt GUI - UIWizardCloneVDPageFormat class implementation.
    44 */
    55
    … …  
    1818/* Qt includes: */
    1919#include <QVBoxLayout>
    20 #include <QButtonGroup>
    21 #include <QRadioButton>
    2220
    2321/* GUI includes: */
    24 #include "UIConverter.h"
    25 #include "UIWizardCloneVDPageBasic1.h"
     22#include "UIWizardCloneVDPageFormat.h"
    2623#include "UIWizardCloneVD.h"
    2724#include "UIWizardDiskEditors.h"
    … …  
    3229#include "CSystemProperties.h"
    3330
    34 UIWizardCloneVDPageBasic1::UIWizardCloneVDPageBasic1(KDeviceType enmDeviceType)
     31UIWizardCloneVDPageFormat::UIWizardCloneVDPageFormat(KDeviceType enmDeviceType)
    3532    : m_pLabel(0)
    3633    , m_pFormatGroupBox(0)
    … …  
    3936}
    4037
    41 void UIWizardCloneVDPageBasic1::prepare(KDeviceType enmDeviceType)
     38void UIWizardCloneVDPageFormat::prepare(KDeviceType enmDeviceType)
    4239{
    4340    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    5047        pMainLayout->addWidget(m_pFormatGroupBox);
    5148        connect(m_pFormatGroupBox, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
    52                 this, &UIWizardCloneVDPageBasic1::sltMediumFormatChanged);
     49                this, &UIWizardCloneVDPageFormat::sltMediumFormatChanged);
    5350    }
    5451    pMainLayout->addStretch();
    … …  
    5653}
    5754
    58 void UIWizardCloneVDPageBasic1::retranslateUi()
     55void UIWizardCloneVDPageFormat::retranslateUi()
    5956{
    6057    /* Translate page: */
    … …  
    6764}
    6865
    69 void UIWizardCloneVDPageBasic1::initializePage()
     66void UIWizardCloneVDPageFormat::initializePage()
    7067{
    7168    /* Translate page: */
    … …  
    7875}
    7976
    80 bool UIWizardCloneVDPageBasic1::isComplete() const
     77bool UIWizardCloneVDPageFormat::isComplete() const
    8178{
    8279    if (m_pFormatGroupBox)
    … …  
    8885}
    8986
    90 void UIWizardCloneVDPageBasic1::sltMediumFormatChanged()
     87void UIWizardCloneVDPageFormat::sltMediumFormatChanged()
    9188{
    9289    if (cloneWizard() && m_pFormatGroupBox)
    … …  
    9693}
    9794
    98 UIWizardCloneVD *UIWizardCloneVDPageBasic1::cloneWizard() const
     95UIWizardCloneVD *UIWizardCloneVDPageFormat::cloneWizard() const
    9996{
    10097    return qobject_cast<UIWizardCloneVD*>(wizard());

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic1 class declaration.
     3 * VBox Qt GUI - UIWizardCloneVDPageFormat class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic1_h
    19 #define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic1_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageFormat_h
     19#define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageFormat_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3030/* COM includes: */
    3131#include "COMEnums.h"
    32 #include "CMediumFormat.h"
    3332
    3433/* Forward declarations: */
    … …  
    3938
    4039/** 2nd page of the Clone Virtual Disk Image wizard (basic extension): */
    41 class UIWizardCloneVDPageBasic1 : public UINativeWizardPage
     40class UIWizardCloneVDPageFormat : public UINativeWizardPage
    4241{
    4342    Q_OBJECT;
    … …  
    4746    /** Constructs basic page.
    4847      * @param  enmDeviceType  Brings the device type to limit format to. */
    49     UIWizardCloneVDPageBasic1(KDeviceType enmDeviceType);
     48    UIWizardCloneVDPageFormat(KDeviceType enmDeviceType);
    5049
    5150private slots:
    … …  
    7473};
    7574
    76 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic1_h */
     75#endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageFormat_h */

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic3 class implementation.
     3 * VBox Qt GUI - UIWizardCloneVDPagePathSize class implementation.
    44 */
    55
    … …  
    1717
    1818/* Qt includes: */
     19#include <QDir>
    1920#include <QVBoxLayout>
    2021
    2122/* GUI includes: */
    22 #include "UIWizardCloneVDPageBasic3.h"
     23#include "UIWizardCloneVDPagePathSize.h"
    2324#include "UIWizardDiskEditors.h"
    2425#include "UIWizardCloneVD.h"
    25 #include "UICommon.h"
    2626#include "UIMessageCenter.h"
    27 #include "UIIconPool.h"
    28 #include "QIFileDialog.h"
    29 #include "QIRichTextLabel.h"
    30 #include "QIToolButton.h"
    3127
    32 /* COM includes: */
    33 #include "CMediumFormat.h"
    34 
    35 UIWizardCloneVDPageBasic3::UIWizardCloneVDPageBasic3(qulonglong uSourceDiskLogicaSize)
     28UIWizardCloneVDPagePathSize::UIWizardCloneVDPagePathSize(qulonglong uSourceDiskLogicaSize)
    3629    : m_pMediumSizePathGroupBox(0)
    3730{
    … …  
    3932}
    4033
    41 void UIWizardCloneVDPageBasic3::prepare(qulonglong uSourceDiskLogicaSize)
     34void UIWizardCloneVDPagePathSize::prepare(qulonglong uSourceDiskLogicaSize)
    4235{
    4336    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    4841        pMainLayout->addWidget(m_pMediumSizePathGroupBox);
    4942        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumLocationButtonClicked,
    50                 this, &UIWizardCloneVDPageBasic3::sltSelectLocationButtonClicked);
     43                this, &UIWizardCloneVDPagePathSize::sltSelectLocationButtonClicked);
    5144        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
    52                 this, &UIWizardCloneVDPageBasic3::sltMediumPathChanged);
     45                this, &UIWizardCloneVDPagePathSize::sltMediumPathChanged);
    5346        connect(m_pMediumSizePathGroupBox, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
    54                 this, &UIWizardCloneVDPageBasic3::sltMediumSizeChanged);
     47                this, &UIWizardCloneVDPagePathSize::sltMediumSizeChanged);
    5548    }
    5649
    … …  
    5952}
    6053
    61 void UIWizardCloneVDPageBasic3::retranslateUi()
     54void UIWizardCloneVDPagePathSize::retranslateUi()
    6255{
    6356    /* Translate page: */
    … …  
    6558}
    6659
    67 void UIWizardCloneVDPageBasic3::initializePage()
     60void UIWizardCloneVDPagePathSize::initializePage()
    6861{
    6962    AssertReturnVoid(cloneWizard() && m_pMediumSizePathGroupBox);
    … …  
    9689}
    9790
    98 bool UIWizardCloneVDPageBasic3::isComplete() const
     91bool UIWizardCloneVDPagePathSize::isComplete() const
    9992{
    10093    AssertReturn(m_pMediumSizePathGroupBox, false);
    101 
    10294    return m_pMediumSizePathGroupBox->isComplete();
    10395}
    10496
    105 bool UIWizardCloneVDPageBasic3::validatePage()
     97bool UIWizardCloneVDPagePathSize::validatePage()
    10698{
    10799    UIWizardCloneVD *pWizard = cloneWizard();
    … …  
    117109}
    118110
    119 UIWizardCloneVD *UIWizardCloneVDPageBasic3::cloneWizard() const
     111UIWizardCloneVD *UIWizardCloneVDPagePathSize::cloneWizard() const
    120112{
    121113    return qobject_cast<UIWizardCloneVD*>(wizard());
    122114}
    123115
    124 void UIWizardCloneVDPageBasic3::sltSelectLocationButtonClicked()
     116void UIWizardCloneVDPagePathSize::sltSelectLocationButtonClicked()
    125117{
    126118    UIWizardCloneVD *pWizard = cloneWizard();
    … …  
    139131}
    140132
    141 void UIWizardCloneVDPageBasic3::sltMediumPathChanged(const QString &strPath)
     133void UIWizardCloneVDPagePathSize::sltMediumPathChanged(const QString &strPath)
    142134{
    143135    UIWizardCloneVD *pWizard = cloneWizard();
    … …  
    151143}
    152144
    153 void UIWizardCloneVDPageBasic3::sltMediumSizeChanged(qulonglong uSize)
     145void UIWizardCloneVDPagePathSize::sltMediumSizeChanged(qulonglong uSize)
    154146{
    155147    UIWizardCloneVD *pWizard = cloneWizard();

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic3 class declaration.
     3 * VBox Qt GUI - UIWizardCloneVDPagePathSize class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic3_h
    19 #define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic3_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPagePathSize_h
     19#define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPagePathSize_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3838
    3939/** 4th page of the Clone Virtual Disk Image wizard (basic extension): */
    40 class UIWizardCloneVDPageBasic3 : public UINativeWizardPage
     40class UIWizardCloneVDPagePathSize : public UINativeWizardPage
    4141{
    4242    Q_OBJECT;
    … …  
    4545
    4646    /** Constructs basic page. */
    47     UIWizardCloneVDPageBasic3(qulonglong uSourceDiskLogicaSize);
     47    UIWizardCloneVDPagePathSize(qulonglong uSourceDiskLogicaSize);
    4848
    4949private slots:
    … …  
    7070    UIWizardCloneVD *cloneWizard() const;
    7171
    72 
    7372    UIMediumSizeAndPathGroupBox *m_pMediumSizePathGroupBox;
    74 
    7573    QSet<QString> m_userModifiedParameters;
    7674};
    7775
    78 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic3_h */
     76#endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPagePathSize_h */

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic2 class implementation.
     3 * VBox Qt GUI - UIWizardCloneVDPageVariant class implementation.
    44 */
    55
    … …  
    1818/* Qt includes: */
    1919#include <QVBoxLayout>
    20 #include <QButtonGroup>
    21 #include <QRadioButton>
    22 #include <QCheckBox>
    2320
    2421/* GUI includes: */
    2522#include "UIWizardDiskEditors.h"
    26 #include "UIWizardCloneVDPageBasic2.h"
     23#include "UIWizardCloneVDPageVariant.h"
    2724#include "UIWizardCloneVD.h"
    2825#include "QIRichTextLabel.h"
    … …  
    3128#include "CMediumFormat.h"
    3229
    33 
    34 UIWizardCloneVDPageBasic2::UIWizardCloneVDPageBasic2(KDeviceType /*enmDeviceType*/)
     30UIWizardCloneVDPageVariant::UIWizardCloneVDPageVariant(KDeviceType /*enmDeviceType*/)
    3531    : m_pDescriptionLabel(0)
    3632    , m_pDynamicLabel(0)
    … …  
    4238}
    4339
    44 void UIWizardCloneVDPageBasic2::prepare()
     40void UIWizardCloneVDPageVariant::prepare()
    4541{
    4642    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    6763        pMainLayout->addWidget(m_pVariantGroupBox);
    6864        connect(m_pVariantGroupBox, &UIDiskVariantGroupBox::sigMediumVariantChanged,
    69                 this, &UIWizardCloneVDPageBasic2::sltMediumVariantChanged);
     65                this, &UIWizardCloneVDPageVariant::sltMediumVariantChanged);
    7066
    7167    }
    … …  
    7571
    7672
    77 void UIWizardCloneVDPageBasic2::retranslateUi()
     73void UIWizardCloneVDPageVariant::retranslateUi()
    7874{
    7975    /* Translate page: */
    … …  
    9490}
    9591
    96 void UIWizardCloneVDPageBasic2::initializePage()
     92void UIWizardCloneVDPageVariant::initializePage()
    9793{
    9894    AssertReturnVoid(cloneWizard());
    … …  
    105101}
    106102
    107 bool UIWizardCloneVDPageBasic2::isComplete() const
     103bool UIWizardCloneVDPageVariant::isComplete() const
    108104{
    109105    AssertReturn(m_pVariantGroupBox, false);
    … …  
    111107}
    112108
    113 UIWizardCloneVD *UIWizardCloneVDPageBasic2::cloneWizard() const
     109UIWizardCloneVD *UIWizardCloneVDPageVariant::cloneWizard() const
    114110{
    115111    return qobject_cast<UIWizardCloneVD*>(wizard());
    116112}
    117113
    118 void UIWizardCloneVDPageBasic2::setWidgetVisibility(const CMediumFormat &mediumFormat)
     114void UIWizardCloneVDPageVariant::setWidgetVisibility(const CMediumFormat &mediumFormat)
    119115{
    120116    AssertReturnVoid(m_pVariantGroupBox);
    … …  
    130126}
    131127
    132 void UIWizardCloneVDPageBasic2::sltMediumVariantChanged(qulonglong uVariant)
     128void UIWizardCloneVDPageVariant::sltMediumVariantChanged(qulonglong uVariant)
    133129{
    134130    if (cloneWizard())

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

    r90826 r90827  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardCloneVDPageBasic2 class declaration.
     3 * VBox Qt GUI - UIWizardCloneVDPageVariant class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic2_h
    19 #define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic2_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageVariant_h
     19#define FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageVariant_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    2929
    3030/* Forward declarations: */
    31 class QButtonGroup;
    32 class QRadioButton;
    33 class QCheckBox;
    3431class QIRichTextLabel;
    3532class UIWizardCloneVD;
    … …  
    3734class UIDiskVariantGroupBox;
    3835
    39 class UIWizardCloneVDPageBasic2 : public UINativeWizardPage
     36class UIWizardCloneVDPageVariant : public UINativeWizardPage
    4037{
    4138    Q_OBJECT;
    … …  
    4441
    4542    /** Constructs basic page. */
    46     UIWizardCloneVDPageBasic2(KDeviceType enmDeviceType);
     43    UIWizardCloneVDPageVariant(KDeviceType enmDeviceType);
    4744
    4845private slots:
    … …  
    7673};
    7774
    78 #endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageBasic2_h */
     75#endif /* !FEQT_INCLUDED_SRC_wizards_clonevd_UIWizardCloneVDPageVariant_h */
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