VirtualBox

Changeset 88599 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Apr 20, 2021 9:13:59 AM (4 years ago)
Author:
vboxsync
Message:

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

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

Legend:

Unmodified
Added
Removed

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

    r88598 r88599  
    911911        src/wizards/newvd/UIWizardNewVDPageFileType.h \
    912912        src/wizards/newvd/UIWizardNewVDPageVariant.h \
    913         src/wizards/newvd/UIWizardNewVDPageBasic3.h \
     913        src/wizards/newvd/UIWizardNewVDPageSizeLocation.h \
    914914        src/wizards/newvd/UIWizardNewVDPageExpert.h
    915915
    … …  
    14491449        src/wizards/newvd/UIWizardNewVDPageFileType.cpp \
    14501450        src/wizards/newvd/UIWizardNewVDPageVariant.cpp \
    1451         src/wizards/newvd/UIWizardNewVDPageBasic3.cpp \
     1451        src/wizards/newvd/UIWizardNewVDPageSizeLocation.cpp \
    14521452        src/wizards/newvd/UIWizardNewVDPageExpert.cpp
    14531453

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

    r88598 r88599  
    2424#include "UIWizardNewVDPageFileType.h"
    2525#include "UIWizardNewVDPageVariant.h"
    26 #include "UIWizardNewVDPageBasic3.h"
     26#include "UIWizardNewVDPageSizeLocation.h"
    2727#include "UIWizardNewVDPageExpert.h"
    2828#include "UIMessageCenter.h"
    … …  
    128128            setPage(Page1, new UIWizardNewVDPageFileType);
    129129            setPage(Page2, new UIWizardNewVDPageVariant);
    130             setPage(Page3, new UIWizardNewVDPageBasic3(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
     130            setPage(Page3, new UIWizardNewVDPageSizeLocation(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
    131131            break;
    132132        }

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

    r82968 r88599  
    6868
    6969    /* Who will be able to create virtual-disk: */
    70     friend class UIWizardNewVDPageBasic3;
     70    friend class UIWizardNewVDPageSizeLocation;
    7171    friend class UIWizardNewVDPageExpert;
    7272

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

    r88598 r88599  
    4646
    4747UIWizardNewVDPageExpert::UIWizardNewVDPageExpert(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
    48     : UIWizardNewVDPage3(strDefaultName, strDefaultPath)
     48    : UIWizardNewVDPageBaseSizeLocation(strDefaultName, strDefaultPath)
    4949    , m_pFormatGroupBox(0)
    5050    , m_pVariantGroupBox(0)
    … …  
    155155    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    156156    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    157     UIWizardNewVDPage3::retranslateWidgets();
     157    UIWizardNewVDPageBaseSizeLocation::retranslateWidgets();
    158158    /* Translate widgets: */
    159159    if (m_pLocationGroupBox)
    … …  
    217217
    218218    /* Make sure we are passing FAT size limitation: */
    219     fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
     219    fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
    220220                                                         fieldImp("mediumPath").toString(),
    221221                                                         fieldImp("mediumSize").toULongLong());

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

    r88598 r88599  
    2525#include "UIWizardNewVDPageFileType.h"
    2626#include "UIWizardNewVDPageVariant.h"
    27 #include "UIWizardNewVDPageBasic3.h"
     27#include "UIWizardNewVDPageSizeLocation.h"
    2828
    2929/* Forward declarations: */
    … …  
    3434                                                     public UIWizardNewVDPageBaseFileType,
    3535                                                     public UIWizardNewVDPageBaseVariant,
    36                                                      public UIWizardNewVDPage3
     36                                                     public UIWizardNewVDPageBaseSizeLocation
    3737{
    3838    Q_OBJECT;

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

    r88597 r88599  
    2424#include "UIConverter.h"
    2525#include "UIWizardNewVDPageFileType.h"
    26 #include "UIWizardNewVDPageBasic3.h"
     26#include "UIWizardNewVDPageSizeLocation.h"
    2727#include "UIWizardNewVD.h"
    2828#include "UICommon.h"
    … …  
    7373        m_formatNames << medFormat.GetName();
    7474        m_pFormatButtonGroup->addButton(pFormatButton, m_formatNames.size() - 1);
    75         m_formatExtensions << UIWizardNewVDPage3::defaultExtension(medFormat);
     75        m_formatExtensions << UIWizardNewVDPageBaseSizeLocation::defaultExtension(medFormat);
    7676    }
    7777}

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

    r88598 r88599  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic3 class implementation.
     3 * VBox Qt GUI - UIWizardNewVDPageSizeLocation class implementation.
    44 */
    55
    … …  
    2727
    2828/* GUI includes: */
    29 #include "UIWizardNewVDPageBasic3.h"
     29#include "UIWizardNewVDPageSizeLocation.h"
    3030#include "UIWizardNewVD.h"
    3131#include "UICommon.h"
    … …  
    4747
    4848
    49 UIWizardNewVDPage3::UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath)
     49UIWizardNewVDPageBaseSizeLocation::UIWizardNewVDPageBaseSizeLocation(const QString &strDefaultName, const QString &strDefaultPath)
    5050    : m_strDefaultName(strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName)
    5151    , m_strDefaultPath(strDefaultPath)
    … …  
    6161}
    6262
    63 UIWizardNewVDPage3::UIWizardNewVDPage3()
     63UIWizardNewVDPageBaseSizeLocation::UIWizardNewVDPageBaseSizeLocation()
    6464    : m_uMediumSizeMin(_4M)
    6565    , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
    … …  
    7373}
    7474
    75 void UIWizardNewVDPage3::onSelectLocationButtonClicked()
     75void UIWizardNewVDPageBaseSizeLocation::onSelectLocationButtonClicked()
    7676{
    7777    /* Get current folder and filename: */
    … …  
    130130
    131131/* static */
    132 QString UIWizardNewVDPage3::toFileName(const QString &strName, const QString &strExtension)
     132QString UIWizardNewVDPageBaseSizeLocation::toFileName(const QString &strName, const QString &strExtension)
    133133{
    134134    /* Convert passed name to native separators (it can be full, actually): */
    … …  
    149149
    150150/* static */
    151 QString UIWizardNewVDPage3::absoluteFilePath(const QString &strFileName, const QString &strPath)
     151QString UIWizardNewVDPageBaseSizeLocation::absoluteFilePath(const QString &strFileName, const QString &strPath)
    152152{
    153153    /* Wrap file-info around received file name: */
    … …  
    164164
    165165/*static */
    166 QString UIWizardNewVDPage3::absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension)
     166QString UIWizardNewVDPageBaseSizeLocation::absoluteFilePath(const QString &strFileName, const QString &strPath, const QString &strExtension)
    167167{
    168168    QString strFilePath = absoluteFilePath(strFileName, strPath);
    … …  
    173173
    174174/* static */
    175 QString UIWizardNewVDPage3::defaultExtension(const CMediumFormat &mediumFormatRef)
     175QString UIWizardNewVDPageBaseSizeLocation::defaultExtension(const CMediumFormat &mediumFormatRef)
    176176{
    177177    if (!mediumFormatRef.isNull())
    … …  
    191191
    192192/* static */
    193 bool UIWizardNewVDPage3::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
     193bool UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(const qulonglong uVariant, const QString &strMediumPath, const qulonglong uSize)
    194194{
    195195    /* If the hard disk is split into 2GB parts then no need to make further checks: */
    … …  
    213213}
    214214
    215 QString UIWizardNewVDPage3::mediumPath() const
     215QString UIWizardNewVDPageBaseSizeLocation::mediumPath() const
    216216{
    217217    if (!m_pLocationEditor)
    … …  
    220220}
    221221
    222 qulonglong UIWizardNewVDPage3::mediumSize() const
     222qulonglong UIWizardNewVDPageBaseSizeLocation::mediumSize() const
    223223{
    224224    return m_pMediumSizeEditor ? m_pMediumSizeEditor->mediumSize() : 0;
    225225}
    226226
    227 void UIWizardNewVDPage3::setMediumSize(qulonglong uMediumSize)
     227void UIWizardNewVDPageBaseSizeLocation::setMediumSize(qulonglong uMediumSize)
    228228{
    229229    if (m_pMediumSizeEditor)
    … …  
    232232
    233233/* static */
    234 QString UIWizardNewVDPage3::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
     234QString UIWizardNewVDPageBaseSizeLocation::stripFormatExtension(const QString &strFileName, const QStringList &formatExtensions)
    235235{
    236236    QString result(strFileName);
    … …  
    249249}
    250250
    251 void UIWizardNewVDPage3::updateLocationEditorAfterFormatChange(const CMediumFormat &mediumFormat, const QStringList &formatExtensions)
     251void UIWizardNewVDPageBaseSizeLocation::updateLocationEditorAfterFormatChange(const CMediumFormat &mediumFormat, const QStringList &formatExtensions)
    252252{
    253253    /* Compose virtual-disk extension: */
    … …  
    268268}
    269269
    270 void UIWizardNewVDPage3::retranslateWidgets()
     270void UIWizardNewVDPageBaseSizeLocation::retranslateWidgets()
    271271{
    272272    if (m_pLocationOpenButton)
    … …  
    284284}
    285285
    286 UIWizardNewVDPageBasic3::UIWizardNewVDPageBasic3(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
    287     : UIWizardNewVDPage3(strDefaultName, strDefaultPath)
     286UIWizardNewVDPageSizeLocation::UIWizardNewVDPageSizeLocation(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
     287    : UIWizardNewVDPageBaseSizeLocation(strDefaultName, strDefaultPath)
    288288{
    289289    /* Create widgets: */
    … …  
    313313
    314314    /* Setup connections: */
    315     connect(m_pLocationEditor, &QLineEdit::textChanged,    this, &UIWizardNewVDPageBasic3::completeChanged);
    316     connect(m_pLocationOpenButton, &QIToolButton::clicked, this, &UIWizardNewVDPageBasic3::sltSelectLocationButtonClicked);
    317     connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVDPageBasic3::completeChanged);
     315    connect(m_pLocationEditor, &QLineEdit::textChanged,    this, &UIWizardNewVDPageSizeLocation::completeChanged);
     316    connect(m_pLocationOpenButton, &QIToolButton::clicked, this, &UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked);
     317    connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged, this, &UIWizardNewVDPageSizeLocation::completeChanged);
    318318
    319319    /* Register fields: */
    … …  
    322322}
    323323
    324 void UIWizardNewVDPageBasic3::sltSelectLocationButtonClicked()
     324void UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked()
    325325{
    326326    /* Call to base-class: */
    … …  
    328328}
    329329
    330 void UIWizardNewVDPageBasic3::retranslateUi()
     330void UIWizardNewVDPageSizeLocation::retranslateUi()
    331331{
    332332    retranslateWidgets();
    … …  
    335335}
    336336
    337 void UIWizardNewVDPageBasic3::initializePage()
     337void UIWizardNewVDPageSizeLocation::initializePage()
    338338{
    339339    /* Translate page: */
    … …  
    347347}
    348348
    349 bool UIWizardNewVDPageBasic3::isComplete() const
     349bool UIWizardNewVDPageSizeLocation::isComplete() const
    350350{
    351351    if (!m_pLocationEditor)
    … …  
    356356}
    357357
    358 bool UIWizardNewVDPageBasic3::validatePage()
     358bool UIWizardNewVDPageSizeLocation::validatePage()
    359359{
    360360    /* Initial result: */

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

    r88598 r88599  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic3 class declaration.
     3 * VBox Qt GUI - UIWizardNewVDPageSizeLocation class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic3_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic3_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageSizeLocation_h
     19#define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageSizeLocation_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3535
    3636/* 3rd page of the New Virtual Hard Drive wizard (base part): */
    37 class SHARED_LIBRARY_STUFF UIWizardNewVDPage3 : public UIWizardPageBase
     37class SHARED_LIBRARY_STUFF UIWizardNewVDPageBaseSizeLocation : public UIWizardPageBase
    3838{
    3939
    … …  
    4646protected:
    4747
    48     UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath);
    49     UIWizardNewVDPage3();
     48    UIWizardNewVDPageBaseSizeLocation(const QString &strDefaultName, const QString &strDefaultPath);
     49    UIWizardNewVDPageBaseSizeLocation();
    5050
    5151    void onSelectLocationButtonClicked();
    … …  
    8989
    9090/* 3rd page of the New Virtual Hard Drive wizard (basic extension): */
    91 class SHARED_LIBRARY_STUFF UIWizardNewVDPageBasic3 : public UIWizardPage, public UIWizardNewVDPage3
     91class SHARED_LIBRARY_STUFF UIWizardNewVDPageSizeLocation : public UIWizardPage, public UIWizardNewVDPageBaseSizeLocation
    9292{
    9393    Q_OBJECT;
    … …  
    9797public:
    9898
    99     UIWizardNewVDPageBasic3(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
     99    UIWizardNewVDPageSizeLocation(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
    100100
    101101protected:
    … …  
    120120
    121121
    122 #endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic3_h */
     122#endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageSizeLocation_h */

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

    r88598 r88599  
    311311    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    312312    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    313     UIWizardNewVDPage3::retranslateWidgets();
     313    UIWizardNewVDPageBaseSizeLocation::retranslateWidgets();
    314314}
    315315
    … …  
    399399        }
    400400        /* Check FAT size limitation of the host hard drive: */
    401         fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
     401        fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
    402402                                                             fieldImp("mediumPath").toString(),
    403403                                                             fieldImp("mediumSize").toULongLong());

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

    r88598 r88599  
    2929#include "UIWizardNewVDPageFileType.h"
    3030#include "UIWizardNewVDPageVariant.h"
    31 #include "UIWizardNewVDPageBasic3.h"
     31#include "UIWizardNewVDPageSizeLocation.h"
    3232#include "UIWizardNewVM.h"
    3333
    … …  
    8282                                public UIWizardNewVDPageBaseFileType,
    8383                                public UIWizardNewVDPageBaseVariant,
    84                                 public UIWizardNewVDPage3
     84                                public UIWizardNewVDPageBaseSizeLocation
    8585{
    8686    Q_OBJECT;

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

    r88598 r88599  
    160160    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    161161    UIWizardNewVDPageBaseVariant::retranslateWidgets();
    162     UIWizardNewVDPage3::retranslateWidgets();
     162    UIWizardNewVDPageBaseSizeLocation::retranslateWidgets();
    163163
    164164    if (m_pToolBox)
    … …  
    489489        }
    490490        /* Check FAT size limitation of the host hard drive: */
    491         fResult = UIWizardNewVDPage3::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
     491        fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
    492492                                                             fieldImp("mediumPath").toString(),
    493493                                                             fieldImp("mediumSize").toULongLong());

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

    r88598 r88599  
    3030#include "UIWizardNewVMPageHardware.h"
    3131#include "UIWizardNewVMPageDisk.h"
    32 #include "UIWizardNewVDPageBasic3.h"
     32#include "UIWizardNewVDPageSizeLocation.h"
    3333
    3434/* Forward declarations: */
    … …  
    4444                                public UIWizardNewVDPageBaseFileType,
    4545                                public UIWizardNewVDPageBaseVariant,
    46                                 public UIWizardNewVDPage3
     46                                public UIWizardNewVDPageBaseSizeLocation
    4747{
    4848

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

    r88577 r88599  
    2929#include "UIWizardNewVM.h"
    3030#include "UIWizardNewVMPageHardware.h"
    31 #include "UIWizardNewVDPageBasic3.h"
     31#include "UIWizardNewVDPageSizeLocation.h"
    3232
    3333/* COM includes: */
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