VirtualBox

Ignore:
Timestamp:
Feb 24, 2021 6:26:21 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
142936
Message:

FE/Qt: bugref:9950. Removing virtual disk selection page

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

Legend:

Unmodified
Added
Removed

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

    r87756 r87864  
    662662        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
    663663        src/wizards/newvm/UIWizardNewVMPageBasic2.h \
    664         src/wizards/newvm/UIWizardNewVMPageBasic3.h \
     664        src/wizards/newvm/UIWizardNewVMPageBasic8.h \
    665665        src/wizards/newvm/UIWizardNewVMPageBasic4.h \
    666666        src/wizards/newvm/UIWizardNewVMPageExpert.h \
    … …  
    11531153        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
    11541154        src/wizards/newvm/UIWizardNewVMPageBasic2.cpp \
    1155         src/wizards/newvm/UIWizardNewVMPageBasic3.cpp \
     1155        src/wizards/newvm/UIWizardNewVMPageBasic8.cpp \
    11561156        src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \
    11571157        src/wizards/newvm/UIWizardNewVMPageExpert.cpp \

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

    r87612 r87864  
    2525#include "UIWizardNewVMPageBasic1.h"
    2626#include "UIWizardNewVMPageBasic2.h"
    27 #include "UIWizardNewVMPageBasic3.h"
     27#include "UIWizardNewVMPageBasic8.h"
    2828#include "UIWizardNewVMPageBasic4.h"
    2929#include "UIWizardNewVMPageExpert.h"
    … …  
    8383            setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup));
    8484            setPage(Page2, new UIWizardNewVMPageBasic2);
    85             setPage(Page3, new UIWizardNewVMPageBasic3);
    86             setPage(Page4, new UIWizardNewVMPageBasic4);
     85            setPage(Page8, new UIWizardNewVMPageBasic8);
     86            //setPage(Page4, new UIWizardNewVMPageBasic4);
    8787            setStartId(Page1);
    8888            break;

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

    r87589 r87864  
    6262        Page1,
    6363        Page2,
    64         Page3,
    65         Page4,
     64        Page8,
     65        //Page4,
    6666        PageMax
    6767    };
    … …  
    100100    /* Who will be able to create virtual-machine: */
    101101    friend class UIWizardNewVMPageBasic4;
     102    friend class UIWizardNewVMPageBasic8;
    102103    friend class UIWizardNewVMPageExpert;
    103104

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

    r87782 r87864  
    498498    if (isUnattendedEnabled())
    499499        return UIWizardNewVM::Page2;
    500     return UIWizardNewVM::Page3;
     500    return UIWizardNewVM::Page8;
    501501}
    502502

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

    r87589 r87864  
    134134    /** Validation stuff. */
    135135    bool isComplete() const;
    136     bool validatePage();
     136    virtual bool validatePage() /* override */;
    137137
    138138    /** Widgets. */

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

    r87863 r87864  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic3 class implementation.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic8 class implementation.
    44 */
    55
    … …  
    2727#include "UIVirtualCPUEditor.h"
    2828#include "UIWizardNewVM.h"
    29 #include "UIWizardNewVMPageBasic3.h"
     29#include "UIWizardNewVMPageBasic8.h"
    3030
    3131/* COM includes: */
    3232#include "CGuestOSType.h"
    3333
    34 UIWizardNewVMPage3::UIWizardNewVMPage3()
     34UIWizardNewVMPage8::UIWizardNewVMPage8()
    3535    : m_pBaseMemoryEditor(0)
    3636    , m_pVirtualCPUEditor(0)
    … …  
    3939}
    4040
    41 int UIWizardNewVMPage3::baseMemory() const
     41int UIWizardNewVMPage8::baseMemory() const
    4242{
    4343    if (!m_pBaseMemoryEditor)
    … …  
    4646}
    4747
    48 int UIWizardNewVMPage3::VCPUCount() const
     48int UIWizardNewVMPage8::VCPUCount() const
    4949{
    5050    if (!m_pVirtualCPUEditor)
    … …  
    5353}
    5454
    55 bool UIWizardNewVMPage3::EFIEnabled() const
     55bool UIWizardNewVMPage8::EFIEnabled() const
    5656{
    5757    if (!m_pEFICheckBox)
    … …  
    6060}
    6161
    62 void UIWizardNewVMPage3::retranslateWidgets()
     62void UIWizardNewVMPage8::retranslateWidgets()
    6363{
    6464    if (m_pEFICheckBox)
    … …  
    7171}
    7272
    73 QWidget *UIWizardNewVMPage3::createHardwareWidgets()
     73QWidget *UIWizardNewVMPage8::createHardwareWidgets()
    7474{
    7575    QWidget *pHardwareContainer = new QWidget;
    … …  
    8686}
    8787
    88 UIWizardNewVMPageBasic3::UIWizardNewVMPageBasic3()
     88UIWizardNewVMPageBasic8::UIWizardNewVMPageBasic8()
    8989    : m_pLabel(0)
    9090{
    … …  
    9696}
    9797
    98 void UIWizardNewVMPageBasic3::prepare()
     98void UIWizardNewVMPageBasic8::prepare()
    9999{
    100100    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
    … …  
    108108}
    109109
    110 void UIWizardNewVMPageBasic3::createConnections()
     110void UIWizardNewVMPageBasic8::createConnections()
    111111{
    112112}
    113113
    114 void UIWizardNewVMPageBasic3::retranslateUi()
     114void UIWizardNewVMPageBasic8::retranslateUi()
    115115{
    116116    setTitle(UIWizardNewVM::tr("Hardware"));
    … …  
    123123}
    124124
    125 void UIWizardNewVMPageBasic3::initializePage()
     125void UIWizardNewVMPageBasic8::initializePage()
    126126{
    127127    retranslateUi();
    … …  
    140140}
    141141
    142 void UIWizardNewVMPageBasic3::cleanupPage()
     142void UIWizardNewVMPageBasic8::cleanupPage()
    143143{
    144144    UIWizardPage::cleanupPage();
    145145}
    146146
    147 bool UIWizardNewVMPageBasic3::isComplete() const
     147bool UIWizardNewVMPageBasic8::isComplete() const
    148148{
    149149    return true;
    150150}
     151
     152bool UIWizardNewVMPageBasic8::validatePage()
     153{
     154    /* Lock finish button: */
     155    startProcessing();
     156
     157    /* Try to create VM: */
     158    bool fResult = qobject_cast<UIWizardNewVM*>(wizard())->createVM();
     159
     160    /* Unlock finish button: */
     161    endProcessing();
     162
     163    return fResult;
     164}

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

    r87863 r87864  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVMPageBasic3 class declaration.
     3 * VBox Qt GUI - UIWizardNewVMPageBasic8 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_UIWizardNewVMPageBasic8_h
     19#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic8_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 UIWizardNewVMPage8 : public UIWizardPageBase
    4343{
    4444
    … …  
    4646
    4747    /** Constructor. */
    48     UIWizardNewVMPage3();
     48    UIWizardNewVMPage8();
    4949
    5050
    … …  
    7171
    7272/** 3rd page of the New Virtual Machine wizard (basic extension). */
    73 class UIWizardNewVMPageBasic3 : public UIWizardPage, public UIWizardNewVMPage3
     73class UIWizardNewVMPageBasic8 : public UIWizardPage, public UIWizardNewVMPage8
    7474{
    7575    Q_OBJECT;
    … …  
    8181
    8282    /** Constructor. */
    83     UIWizardNewVMPageBasic3();
     83    UIWizardNewVMPageBasic8();
    8484
    8585protected:
    … …  
    106106
    107107    bool isComplete() const;
     108    virtual bool validatePage() /* override */;
    108109
    109110    /** Widgets. */
    … …  
    111112};
    112113
    113 #endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic3_h */
     114#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic8_h */

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

    r87833 r87864  
    189189    UIWizardNewVMPage1::retranslateWidgets();
    190190    UIWizardNewVMPage2::retranslateWidgets();
    191     UIWizardNewVMPage3::retranslateWidgets();
     191    UIWizardNewVMPage8::retranslateWidgets();
    192192    UIWizardNewVMPage4::retranslateWidgets();
    193193

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

    r87621 r87864  
    2828#include "UIWizardNewVMPageBasic1.h"
    2929#include "UIWizardNewVMPageBasic2.h"
    30 #include "UIWizardNewVMPageBasic3.h"
     30#include "UIWizardNewVMPageBasic8.h"
    3131#include "UIWizardNewVMPageBasic4.h"
    3232
    … …  
    3939                                public UIWizardNewVMPage1,
    4040                                public UIWizardNewVMPage2,
    41                                 public UIWizardNewVMPage3,
     41                                public UIWizardNewVMPage8,
    4242                                public UIWizardNewVMPage4
    4343{
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