VirtualBox

Changeset 88577 in vbox


Ignore:
Timestamp:
Apr 19, 2021 1:23:37 PM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Renaming page 3 and 4 of the new vm wizard.

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

Legend:

Unmodified
Added
Removed

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

    r88576 r88577  
    663663        src/wizards/newvm/UIWizardNewVMPageNameOSType.h \
    664664        src/wizards/newvm/UIWizardNewVMPageUnattended.h \
    665         src/wizards/newvm/UIWizardNewVMPageBasic3.h \
    666         src/wizards/newvm/UIWizardNewVMPageBasic4.h \
     665        src/wizards/newvm/UIWizardNewVMPageHardware.h \
     666        src/wizards/newvm/UIWizardNewVMPageDisk.h \
    667667        src/wizards/newvm/UIWizardNewVMPageExpert.h \
    668668        src/wizards/clonevm/UIWizardCloneVM.h \
    … …  
    11541154        src/wizards/newvm/UIWizardNewVMPageNameOSType.cpp \
    11551155        src/wizards/newvm/UIWizardNewVMPageUnattended.cpp \
    1156         src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
    1157         src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
     1156        src/wizards/newvm/UIWizardNewVMPageHardware.cpp \
     1157        src/wizards/newvm/UIWizardNewVMPageDisk.cpp \
    11581158        src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
    11591159        src/wizards/clonevm/UIWizardCloneVM.cpp \

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

    r88576 r88577  
    2525#include "UIWizardNewVMPageNameOSType.h"
    2626#include "UIWizardNewVMPageUnattended.h"
    27 #include "UIWizardNewVMPageBasic3.h"
    28 #include "UIWizardNewVMPageBasic4.h"
     27#include "UIWizardNewVMPageHardware.h"
     28#include "UIWizardNewVMPageDisk.h"
    2929#include "UIWizardNewVMPageExpert.h"
    3030#include "UIMessageCenter.h"
    … …  
    8484            setPage(Page1, new UIWizardNewVMPageNameOSType(m_strGroup));
    8585            setPage(Page2, new UIWizardNewVMPageUnattended);
    86             setPage(Page3, new UIWizardNewVMPageBasic3);
    87             setPage(Page4, new UIWizardNewVMPageBasic4);
     86            setPage(Page3, new UIWizardNewVMPageHardware);
     87            setPage(Page4, new UIWizardNewVMPageDisk);
    8888
    8989            setStartId(Page1);

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

    r88246 r88577  
    112112    bool getBoolFieldValue(const QString &strFieldName) const;
    113113
    114     friend class UIWizardNewVMPageBasic4;
     114    friend class UIWizardNewVMPageDisk;
    115115    friend class UIWizardNewVMPageExpert;
    116116

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

    r88576 r88577  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic4 class implementation.
     3 * VBox Qt GUI - UIWizardNewVMPageDisk class implementation.
    44 */
    55
    … …  
    3636#include "UIMessageCenter.h"
    3737#include "UIWizardNewVD.h"
    38 #include "UIWizardNewVMPageBasic4.h"
     38#include "UIWizardNewVMPageDisk.h"
    3939
    4040/* COM includes: */
    … …  
    4242#include "CSystemProperties.h"
    4343
    44 UIWizardNewVMPage4::UIWizardNewVMPage4()
     44UIWizardNewVMPageDiskBase::UIWizardNewVMPageDiskBase()
    4545    : m_fRecommendedNoDisk(false)
    4646    , m_pDiskEmpty(0)
    … …  
    5353}
    5454
    55 SelectedDiskSource UIWizardNewVMPage4::selectedDiskSource() const
     55SelectedDiskSource UIWizardNewVMPageDiskBase::selectedDiskSource() const
    5656{
    5757    return m_enmSelectedDiskSource;
    5858}
    5959
    60 void UIWizardNewVMPage4::setSelectedDiskSource(SelectedDiskSource enmSelectedDiskSource)
     60void UIWizardNewVMPageDiskBase::setSelectedDiskSource(SelectedDiskSource enmSelectedDiskSource)
    6161{
    6262    m_enmSelectedDiskSource = enmSelectedDiskSource;
    6363}
    6464
    65 void UIWizardNewVMPage4::getWithFileOpenDialog()
     65void UIWizardNewVMPageDiskBase::getWithFileOpenDialog()
    6666{
    6767    QUuid uMediumId;
    … …  
    7979}
    8080
    81 void UIWizardNewVMPage4::retranslateWidgets()
     81void UIWizardNewVMPageDiskBase::retranslateWidgets()
    8282{
    8383    if (m_pDiskEmpty)
    … …  
    9191}
    9292
    93 void UIWizardNewVMPage4::setEnableDiskSelectionWidgets(bool fEnabled)
     93void UIWizardNewVMPageDiskBase::setEnableDiskSelectionWidgets(bool fEnabled)
    9494{
    9595    if (!m_pDiskSelector || !m_pDiskSelectionButton)
    … …  
    100100}
    101101
    102 QWidget *UIWizardNewVMPage4::createNewDiskWidgets()
     102QWidget *UIWizardNewVMPageDiskBase::createNewDiskWidgets()
    103103{
    104104    return new QWidget();
    105105}
    106106
    107 QWidget *UIWizardNewVMPage4::createDiskWidgets()
     107QWidget *UIWizardNewVMPageDiskBase::createDiskWidgets()
    108108{
    109109    QWidget *pDiskContainer = new QWidget;
    … …  
    140140}
    141141
    142 UIWizardNewVMPageBasic4::UIWizardNewVMPageBasic4()
     142UIWizardNewVMPageDisk::UIWizardNewVMPageDisk()
    143143    : m_pLabel(0)
    144144    , m_fUserSetSize(false)
    … …  
    176176}
    177177
    178 CMediumFormat UIWizardNewVMPageBasic4::mediumFormat() const
     178CMediumFormat UIWizardNewVMPageDisk::mediumFormat() const
    179179{
    180180    return m_mediumFormat;
    181181}
    182182
    183 QString UIWizardNewVMPageBasic4::mediumPath() const
     183QString UIWizardNewVMPageDisk::mediumPath() const
    184184{
    185185    return absoluteFilePath(toFileName(m_strDefaultName, m_strDefaultExtension), m_strDefaultPath);
    186186}
    187187
    188 void UIWizardNewVMPageBasic4::prepare()
     188void UIWizardNewVMPageDisk::prepare()
    189189{
    190190    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    201201}
    202202
    203 QWidget *UIWizardNewVMPageBasic4::createNewDiskWidgets()
     203QWidget *UIWizardNewVMPageDisk::createNewDiskWidgets()
    204204{
    205205    QWidget *pWidget = new QWidget;
    … …  
    244244}
    245245
    246 void UIWizardNewVMPageBasic4::createConnections()
     246void UIWizardNewVMPageDisk::createConnections()
    247247{
    248248    if (m_pDiskSourceButtonGroup)
    249249        connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
    250                 this, &UIWizardNewVMPageBasic4::sltSelectedDiskSourceChanged);
     250                this, &UIWizardNewVMPageDisk::sltSelectedDiskSourceChanged);
    251251    if (m_pDiskSelector)
    252252        connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
    253                 this, &UIWizardNewVMPageBasic4::sltMediaComboBoxIndexChanged);
     253                this, &UIWizardNewVMPageDisk::sltMediaComboBoxIndexChanged);
    254254    if (m_pDiskSelectionButton)
    255255        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
    256                 this, &UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog);
     256                this, &UIWizardNewVMPageDisk::sltGetWithFileOpenDialog);
    257257    if (m_pMediumSizeEditor)
    258258    {
    259259        connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
    260                 this, &UIWizardNewVMPageBasic4::completeChanged);
     260                this, &UIWizardNewVMPageDisk::completeChanged);
    261261        connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
    262                 this, &UIWizardNewVMPageBasic4::sltHandleSizeEditorChange);
    263     }
    264 }
    265 
    266 void UIWizardNewVMPageBasic4::sltSelectedDiskSourceChanged()
     262                this, &UIWizardNewVMPageDisk::sltHandleSizeEditorChange);
     263    }
     264}
     265
     266void UIWizardNewVMPageDisk::sltSelectedDiskSourceChanged()
    267267{
    268268    if (!m_pDiskSourceButtonGroup)
    … …  
    285285}
    286286
    287 void UIWizardNewVMPageBasic4::sltMediaComboBoxIndexChanged()
     287void UIWizardNewVMPageDisk::sltMediaComboBoxIndexChanged()
    288288{
    289289    /* Make sure to set m_virtualDisk: */
    … …  
    292292}
    293293
    294 void UIWizardNewVMPageBasic4::sltGetWithFileOpenDialog()
     294void UIWizardNewVMPageDisk::sltGetWithFileOpenDialog()
    295295{
    296296    getWithFileOpenDialog();
    297297}
    298298
    299 void UIWizardNewVMPageBasic4::retranslateUi()
     299void UIWizardNewVMPageDisk::retranslateUi()
    300300{
    301301    setTitle(UIWizardNewVM::tr("Virtual Hard disk"));
    … …  
    308308                                            "Alternatively you can create a virtual machine without a virtual hard disk.</p>"));
    309309
    310     UIWizardNewVMPage4::retranslateWidgets();
     310    UIWizardNewVMPageDiskBase::retranslateWidgets();
    311311    UIWizardNewVDPage1::retranslateWidgets();
    312312    UIWizardNewVDPage2::retranslateWidgets();
    … …  
    314314}
    315315
    316 void UIWizardNewVMPageBasic4::initializePage()
     316void UIWizardNewVMPageDisk::initializePage()
    317317{
    318318    retranslateUi();
    … …  
    357357}
    358358
    359 void UIWizardNewVMPageBasic4::cleanupPage()
     359void UIWizardNewVMPageDisk::cleanupPage()
    360360{
    361361    UIWizardPage::cleanupPage();
    362362}
    363363
    364 bool UIWizardNewVMPageBasic4::isComplete() const
     364bool UIWizardNewVMPageDisk::isComplete() const
    365365{
    366366    if (selectedDiskSource() == SelectedDiskSource_New)
    … …  
    374374}
    375375
    376 bool UIWizardNewVMPageBasic4::validatePage()
     376bool UIWizardNewVMPageDisk::validatePage()
    377377{
    378378    bool fResult = true;
    … …  
    432432}
    433433
    434 void UIWizardNewVMPageBasic4::sltHandleSizeEditorChange()
     434void UIWizardNewVMPageDisk::sltHandleSizeEditorChange()
    435435{
    436436    m_fUserSetSize = true;
    437437}
    438438
    439 void UIWizardNewVMPageBasic4::setEnableNewDiskWidgets(bool fEnable)
     439void UIWizardNewVMPageDisk::setEnableNewDiskWidgets(bool fEnable)
    440440{
    441441    if (m_pMediumSizeEditor)
    … …  
    447447}
    448448
    449 void UIWizardNewVMPageBasic4::setVirtualDiskFromDiskCombo()
     449void UIWizardNewVMPageDisk::setVirtualDiskFromDiskCombo()
    450450{
    451451    AssertReturnVoid(m_pDiskSelector);

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

    r88576 r88577  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic4 class declaration.
     3 * VBox Qt GUI - UIWizardNewVMPageDisk class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageDisk_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageDisk_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    4444
    4545
    46 class UIWizardNewVMPage4 : public UIWizardPageBase
     46class UIWizardNewVMPageDiskBase : public UIWizardPageBase
    4747{
    4848
    … …  
    5252protected:
    5353
    54     UIWizardNewVMPage4();
     54    UIWizardNewVMPageDiskBase();
    5555
    5656    SelectedDiskSource selectedDiskSource() const;
    … …  
    7878};
    7979
    80 class UIWizardNewVMPageBasic4 : public UIWizardPage,
    81                                 public UIWizardNewVMPage4,
     80class UIWizardNewVMPageDisk : public UIWizardPage,
     81                                public UIWizardNewVMPageDiskBase,
    8282                                public UIWizardNewVDPage1,
    8383                                public UIWizardNewVDPage2,
    … …  
    9393public:
    9494
    95     UIWizardNewVMPageBasic4();
     95    UIWizardNewVMPageDisk();
    9696    /** For the guide wizard mode medium path, name and extention is static and we have
    9797      * no UI element for this. thus override. */
    … …  
    137137};
    138138
    139 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic4_h */
     139#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageDisk_h */

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

    r88576 r88577  
    156156    UIWizardNewVMPageBaseNameOSType::retranslateWidgets();
    157157    UIWizardNewVMPageBaseUnattended::retranslateWidgets();
    158     UIWizardNewVMPage3::retranslateWidgets();
    159     UIWizardNewVMPage4::retranslateWidgets();
     158    UIWizardNewVMPageHardwareBase::retranslateWidgets();
     159    UIWizardNewVMPageDiskBase::retranslateWidgets();
    160160    UIWizardNewVDPage1::retranslateWidgets();
    161161    UIWizardNewVDPage2::retranslateWidgets();

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

    r88576 r88577  
    2828#include "UIWizardNewVMPageNameOSType.h"
    2929#include "UIWizardNewVMPageUnattended.h"
    30 #include "UIWizardNewVMPageBasic3.h"
    31 #include "UIWizardNewVMPageBasic4.h"
     30#include "UIWizardNewVMPageHardware.h"
     31#include "UIWizardNewVMPageDisk.h"
    3232#include "UIWizardNewVDPageBasic3.h"
    3333
    … …  
    4040                                public UIWizardNewVMPageBaseNameOSType,
    4141                                public UIWizardNewVMPageBaseUnattended,
    42                                 public UIWizardNewVMPage3,
    43                                 public UIWizardNewVMPage4,
     42                                public UIWizardNewVMPageHardwareBase,
     43                                public UIWizardNewVMPageDiskBase,
    4444                                public UIWizardNewVDPage1,
    4545                                public UIWizardNewVDPage2,

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

    r88576 r88577  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic3 class implementation.
     3 * VBox Qt GUI - UIWizardNewVMPageHardware class implementation.
    44 */
    55
    … …  
    2828#include "UIVirtualCPUEditor.h"
    2929#include "UIWizardNewVM.h"
    30 #include "UIWizardNewVMPageBasic3.h"
     30#include "UIWizardNewVMPageHardware.h"
    3131#include "UIWizardNewVDPageBasic3.h"
    3232
    … …  
    3434#include "CGuestOSType.h"
    3535
    36 UIWizardNewVMPage3::UIWizardNewVMPage3()
     36UIWizardNewVMPageHardwareBase::UIWizardNewVMPageHardwareBase()
    3737    : m_pBaseMemoryEditor(0)
    3838    , m_pVirtualCPUEditor(0)
    … …  
    4141}
    4242
    43 int UIWizardNewVMPage3::baseMemory() const
     43int UIWizardNewVMPageHardwareBase::baseMemory() const
    4444{
    4545    if (!m_pBaseMemoryEditor)
    … …  
    4848}
    4949
    50 int UIWizardNewVMPage3::VCPUCount() const
     50int UIWizardNewVMPageHardwareBase::VCPUCount() const
    5151{
    5252    if (!m_pVirtualCPUEditor)
    … …  
    5555}
    5656
    57 bool UIWizardNewVMPage3::EFIEnabled() const
     57bool UIWizardNewVMPageHardwareBase::EFIEnabled() const
    5858{
    5959    if (!m_pEFICheckBox)
    … …  
    6262}
    6363
    64 void UIWizardNewVMPage3::retranslateWidgets()
     64void UIWizardNewVMPageHardwareBase::retranslateWidgets()
    6565{
    6666    if (m_pEFICheckBox)
    … …  
    7373}
    7474
    75 QWidget *UIWizardNewVMPage3::createHardwareWidgets()
     75QWidget *UIWizardNewVMPageHardwareBase::createHardwareWidgets()
    7676{
    7777    QWidget *pHardwareContainer = new QWidget;
    … …  
    8989}
    9090
    91 UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
     91UIWizardNewVMPageHardware::UIWizardNewVMPageHardware()
    9292    : m_pLabel(0)
    9393{
    … …  
    9999}
    100100
    101 void UIWizardNewVMPageBasic3::prepare()
     101void UIWizardNewVMPageHardware::prepare()
    102102{
    103103    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    111111}
    112112
    113 void UIWizardNewVMPageBasic3::createConnections()
     113void UIWizardNewVMPageHardware::createConnections()
    114114{
    115115}
    116116
    117 void UIWizardNewVMPageBasic3::retranslateUi()
     117void UIWizardNewVMPageHardware::retranslateUi()
    118118{
    119119    setTitle(UIWizardNewVM::tr("Hardware"));
    … …  
    126126}
    127127
    128 void UIWizardNewVMPageBasic3::initializePage()
     128void UIWizardNewVMPageHardware::initializePage()
    129129{
    130130    retranslateUi();
    … …  
    143143}
    144144
    145 void UIWizardNewVMPageBasic3::cleanupPage()
     145void UIWizardNewVMPageHardware::cleanupPage()
    146146{
    147147    UIWizardPage::cleanupPage();
    148148}
    149149
    150 bool UIWizardNewVMPageBasic3::isComplete() const
     150bool UIWizardNewVMPageHardware::isComplete() const
    151151{
    152152    return true;

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

    r88576 r88577  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic3 class declaration.
     3 * VBox Qt GUI - UIWizardNewVMPageHardware class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageHardware_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageHardware_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    4040
    4141/** 3rd page of the New Virtual Machine wizard (base part). */
    42 class UIWizardNewVMPage3 : public UIWizardPageBase
     42class UIWizardNewVMPageHardwareBase : public UIWizardPageBase
    4343{
    4444
    … …  
    4646
    4747    /** Constructor. */
    48     UIWizardNewVMPage3();
     48    UIWizardNewVMPageHardwareBase();
    4949
    5050
    … …  
    7171
    7272/** 3rd page of the New Virtual Machine wizard (basic extension). */
    73 class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
     73class UIWizardNewVMPageHardware : public UIWizardPage, public UIWizardNewVMPageHardwareBase
    7474{
    7575    Q_OBJECT;
    … …  
    8181
    8282    /** Constructor. */
    83     UIWizardNewVMPageBasic3();
     83    UIWizardNewVMPageHardware();
    8484
    8585protected:
    … …  
    111111};
    112112
    113 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */
     113#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageHardware_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