VirtualBox

Ignore:
Timestamp:
Jul 6, 2020 10:42:13 AM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9515. Renaming PageDisk to Page3

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

Legend:

Unmodified
Added
Removed

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

    r85063 r85064  
    652652        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
    653653        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
    654         src/wizards/newvm/UIWizardNewVMPageBasicDisk.h \
     654        src/wizards/newvm/UIWizardNewVMPageBasic3.h \
    655655        src/wizards/newvm/UIWizardNewVMPageExpert.h \
    656656        src/wizards/clonevm/UIWizardCloneVM.h \
    … …  
    11141114        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
    11151115        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
    1116         src/wizards/newvm/UIWizardNewVMPageBasicDisk.cpp \
     1116        src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
    11171117        src/wizards/newvm/UIWizardNewVMPageExpert.cpp \
    11181118        src/wizards/clonevm/UIWizardCloneVM.cpp \

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

    r85063 r85064  
    2121#include "UIWizardNewVMPageBasic1.h"
    2222#include "UIWizardNewVMPageBasic2.h"
    23 #include "UIWizardNewVMPageBasicDisk.h"
     23#include "UIWizardNewVMPageBasic3.h"
    2424#include "UIWizardNewVMPageExpert.h"
    2525#include "UIMessageCenter.h"
    … …  
    7676            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
    7777            setPage(Page2, new UIWizardNewVMPageBasic2);
    78             setPage(PageDisk, new UIWizardNewVMPageBasicDisk);
     78            setPage(Page3, new UIWizardNewVMPageBasic3);
    7979            setStartId(Page1);
    8080            break;

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

    r85063 r85064  
    6262        Page1,
    6363        Page2,
    64         PageDisk,
     64        Page3,
    6565        PageMax
    6666    };
    … …  
    9898
    9999    /* Who will be able to create virtual-machine: */
    100     friend class UIWizardNewVMPageBasicDisk;
     100    friend class UIWizardNewVMPageBasic3;
    101101    friend class UIWizardNewVMPageExpert;
    102102

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

    r85063 r85064  
    508508    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
    509509    if (!pWizard || !pWizard->isUnattendedInstallEnabled())
    510         return UIWizardNewVM::PageDisk;
     510        return UIWizardNewVM::Page3;
    511511    return UIWizardNewVM::Page2;
    512512}

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

    r85063 r85064  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasicDisk class implementation.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic3 class implementation.
    44 */
    55
    … …  
    3535#include "UIWizardNewVD.h"
    3636#include "UIWizardNewVM.h"
    37 #include "UIWizardNewVMPageBasicDisk.h"
    38 
    39 UIWizardNewVMPageDisk::UIWizardNewVMPageDisk()
     37#include "UIWizardNewVMPageBasic3.h"
     38
     39UIWizardNewVMPage3::UIWizardNewVMPage3()
    4040    : m_fRecommendedNoDisk(false)
    4141    , m_pToolBox(0)
    … …  
    5050}
    5151
    52 void UIWizardNewVMPageDisk::updateVirtualDiskSource()
     52void UIWizardNewVMPage3::updateVirtualDiskSource()
    5353{
    5454    /* Enable/disable controls: */
    … …  
    7171}
    7272
    73 void UIWizardNewVMPageDisk::getWithFileOpenDialog()
     73void UIWizardNewVMPage3::getWithFileOpenDialog()
    7474{
    7575    /* Get opened medium id: */
    … …  
    9494}
    9595
    96 bool UIWizardNewVMPageDisk::getWithNewVirtualDiskWizard()
     96bool UIWizardNewVMPage3::getWithNewVirtualDiskWizard()
    9797{
    9898    /* Create New Virtual Hard Drive wizard: */
    … …  
    116116}
    117117
    118 int UIWizardNewVMPageDisk::baseMemory() const
     118int UIWizardNewVMPage3::baseMemory() const
    119119{
    120120    if (!m_pBaseMemoryEditor)
    … …  
    123123}
    124124
    125 int UIWizardNewVMPageDisk::VCPUCount() const
     125int UIWizardNewVMPage3::VCPUCount() const
    126126{
    127127    if (!m_pVirtualCPUEditor)
    … …  
    130130}
    131131
    132 void UIWizardNewVMPageDisk::ensureNewVirtualDiskDeleted()
     132void UIWizardNewVMPage3::ensureNewVirtualDiskDeleted()
    133133{
    134134    /* Make sure virtual-disk valid: */
    … …  
    154154}
    155155
    156 void UIWizardNewVMPageDisk::createDiskWidgets()
     156void UIWizardNewVMPage3::createDiskWidgets()
    157157{
    158158    QWidget *pDiskContainer = new QWidget;
    … …  
    186186}
    187187
    188 void UIWizardNewVMPageDisk::createHardwareWidgets()
     188void UIWizardNewVMPage3::createHardwareWidgets()
    189189{
    190190    QWidget *pHardwareContainer = new QWidget;
    … …  
    201201}
    202202
    203 UIWizardNewVMPageBasicDisk::UIWizardNewVMPageBasicDisk()
     203UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
    204204{
    205205    prepare();
    … …  
    215215}
    216216
    217 void UIWizardNewVMPageBasicDisk::prepare()
     217void UIWizardNewVMPageBasic3::prepare()
    218218{
    219219    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    231231}
    232232
    233 void UIWizardNewVMPageBasicDisk::createConnections()
     233void UIWizardNewVMPageBasic3::createConnections()
    234234{
    235235    connect(m_pDiskSkip, &QRadioButton::toggled,
    236             this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged);
     236            this, &UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged);
    237237    connect(m_pDiskCreate, &QRadioButton::toggled,
    238             this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged);
     238            this, &UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged);
    239239    connect(m_pDiskPresent, &QRadioButton::toggled,
    240             this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged);
     240            this, &UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged);
    241241    connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
    242             this, &UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged);
     242            this, &UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged);
    243243    connect(m_pVMMButton, &QIToolButton::clicked,
    244             this, &UIWizardNewVMPageBasicDisk::sltGetWithFileOpenDialog);
    245 }
    246 
    247 void UIWizardNewVMPageBasicDisk::sltVirtualDiskSourceChanged()
     244            this, &UIWizardNewVMPageBasic3::sltGetWithFileOpenDialog);
     245}
     246
     247void UIWizardNewVMPageBasic3::sltVirtualDiskSourceChanged()
    248248{
    249249    /* Call to base-class: */
    … …  
    254254}
    255255
    256 void UIWizardNewVMPageBasicDisk::sltGetWithFileOpenDialog()
     256void UIWizardNewVMPageBasic3::sltGetWithFileOpenDialog()
    257257{
    258258    /* Call to base-class: */
    … …  
    260260}
    261261
    262 void UIWizardNewVMPageBasicDisk::retranslateUi()
     262void UIWizardNewVMPageBasic3::retranslateUi()
    263263{
    264264    /* Translate page: */
    … …  
    289289}
    290290
    291 void UIWizardNewVMPageBasicDisk::initializePage()
     291void UIWizardNewVMPageBasic3::initializePage()
    292292{
    293293    /* Translate page: */
    … …  
    310310}
    311311
    312 void UIWizardNewVMPageBasicDisk::cleanupPage()
     312void UIWizardNewVMPageBasic3::cleanupPage()
    313313{
    314314    /* Call to base-class: */
    … …  
    317317}
    318318
    319 bool UIWizardNewVMPageBasicDisk::isComplete() const
     319bool UIWizardNewVMPageBasic3::isComplete() const
    320320{
    321321    /* Make sure 'virtualDisk' field feats the rules: */
    … …  
    325325}
    326326
    327 bool UIWizardNewVMPageBasicDisk::validatePage()
     327bool UIWizardNewVMPageBasic3::validatePage()
    328328{
    329329    /* Initial result: */

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

    r85063 r85064  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasicDisk class declaration.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic3 class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    4141class UIVirtualCPUEditor;
    4242
    43 /* 3rd page of the New Virtual Machine wizard (base part): */
    44 class UIWizardNewVMPageDisk : public UIWizardPageBase
     43/** 3rd page of the New Virtual Machine wizard (base part). */
     44class UIWizardNewVMPage3 : public UIWizardPageBase
    4545{
    4646
    … …  
    5454
    5555
    56     /* Constructor: */
    57     UIWizardNewVMPageDisk();
     56    /** Constructor. */
     57    UIWizardNewVMPage3();
    5858
    59     /* Handlers: */
     59    /** Handlers. */
    6060    void updateVirtualDiskSource();
    6161    void getWithFileOpenDialog();
    6262    bool getWithNewVirtualDiskWizard();
    6363
    64     /* Stuff for 'virtualDisk' field: */
     64    /** Stuff for 'virtualDisk' field. */
    6565    CMedium virtualDisk() const { return m_virtualDisk; }
    6666    void setVirtualDisk(const CMedium &virtualDisk) { m_virtualDisk = virtualDisk; }
    6767
    68     /* Stuff for 'virtualDiskId' field: */
     68    /** Stuff for 'virtualDiskId' field. */
    6969    QUuid virtualDiskId() const { return m_uVirtualDiskId; }
    7070    void setVirtualDiskId(const QUuid &uVirtualDiskId) { m_uVirtualDiskId = uVirtualDiskId; }
    7171
    72     /* Stuff for 'virtualDiskName' field: */
     72    /** Stuff for 'virtualDiskName' field. */
    7373    QString virtualDiskName() const { return m_strVirtualDiskName; }
    7474    void setVirtualDiskName(const QString &strVirtualDiskName) { m_strVirtualDiskName = strVirtualDiskName; }
    7575
    76     /* Stuff for 'virtualDiskLocation' field: */
     76    /** Stuff for 'virtualDiskLocation' field. */
    7777    QString virtualDiskLocation() const { return m_strVirtualDiskLocation; }
    7878    void setVirtualDiskLocation(const QString &strVirtualDiskLocation) { m_strVirtualDiskLocation = strVirtualDiskLocation; }
    … …  
    8484    void createHardwareWidgets();
    8585
    86     /* Helpers: */
     86    /** Helpers. */
    8787    void ensureNewVirtualDiskDeleted();
    8888
    89     /* Input: */
     89    /** Input. */
    9090    bool m_fRecommendedNoDisk;
    9191
    92     /* Variables: */
     92    /** Variables. */
    9393    CMedium m_virtualDisk;
    9494    QUuid   m_uVirtualDiskId;
    … …  
    110110};
    111111
    112 /* 3rd page of the New Virtual Machine wizard (basic extension): */
    113 class UIWizardNewVMPageBasicDisk : public UIWizardPage, public UIWizardNewVMPageDisk
     112/** 3rd page of the New Virtual Machine wizard (basic extension). */
     113class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
    114114{
    115115    Q_OBJECT;
    … …  
    123123public:
    124124
    125     /* Constructor: */
    126     UIWizardNewVMPageBasicDisk();
     125    /** Constructor. */
     126    UIWizardNewVMPageBasic3();
    127127
    128128protected:
    129129
    130     /* Wrapper to access 'wizard' from base part: */
     130    /** Wrapper to access 'wizard' from base part. */
    131131    UIWizard *wizardImp() const { return wizard(); }
    132     /* Wrapper to access 'this' from base part: */
     132    /** Wrapper to access 'this' from base part. */
    133133    UIWizardPage* thisImp() { return this; }
    134     /* Wrapper to access 'wizard-field' from base part: */
     134    /** Wrapper to access 'wizard-field' from base part. */
    135135    QVariant fieldImp(const QString &strFieldName) const { return UIWizardPage::field(strFieldName); }
    136136
    137137private slots:
    138138
    139     /* Handlers: */
     139    /** Handlers. */
    140140    void sltVirtualDiskSourceChanged();
    141141    void sltGetWithFileOpenDialog();
    … …  
    144144
    145145
    146     /** Prepare stuff: */
     146    /** Prepare stuff. */
    147147    void prepare();
    148148    void createConnections();
    … …  
    151151    void cleanupPage();
    152152
    153     /** Validation stuff: */
     153    /** Validation stuff. */
    154154    bool isComplete() const;
    155155    bool validatePage();
    156156
    157     /* Widgets: */
     157    /** Widgets. */
    158158    QIRichTextLabel *m_pLabel;
    159159};
    160160
    161 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasicDisk_h */
     161#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */

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

    r85063 r85064  
    2424/* Local includes: */
    2525#include "UIWizardNewVMPageBasic1.h"
    26 #include "UIWizardNewVMPageBasicDisk.h"
     26#include "UIWizardNewVMPageBasic3.h"
    2727
    2828/* Forward declarations: */
    … …  
    3232class UIWizardNewVMPageExpert : public UIWizardPage,
    3333                                public UIWizardNewVMPage1,
    34                                 public UIWizardNewVMPageDisk
     34                                public UIWizardNewVMPage3
    3535{
    3636    Q_OBJECT;
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