VirtualBox

Changeset 88597 in vbox for trunk/src


Ignore:
Timestamp:
Apr 20, 2021 8:02:57 AM (4 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996. Renaming page 1 o the new vd wizard

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

Legend:

Unmodified
Added
Removed

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

    r88577 r88597  
    909909        src/wizards/UIWizardPage.h \
    910910        src/wizards/newvd/UIWizardNewVD.h \
    911         src/wizards/newvd/UIWizardNewVDPageBasic1.h \
     911        src/wizards/newvd/UIWizardNewVDPageFileType.h \
    912912        src/wizards/newvd/UIWizardNewVDPageBasic2.h \
    913913        src/wizards/newvd/UIWizardNewVDPageBasic3.h \
    … …  
    14471447        src/wizards/UIWizardPage.cpp \
    14481448        src/wizards/newvd/UIWizardNewVD.cpp \
    1449         src/wizards/newvd/UIWizardNewVDPageBasic1.cpp \
     1449        src/wizards/newvd/UIWizardNewVDPageFileType.cpp \
    14501450        src/wizards/newvd/UIWizardNewVDPageBasic2.cpp \
    14511451        src/wizards/newvd/UIWizardNewVDPageBasic3.cpp \

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

    r87860 r88597  
    2222#include "UICommon.h"
    2323#include "UIWizardNewVD.h"
    24 #include "UIWizardNewVDPageBasic1.h"
     24#include "UIWizardNewVDPageFileType.h"
    2525#include "UIWizardNewVDPageBasic2.h"
    2626#include "UIWizardNewVDPageBasic3.h"
    … …  
    126126        case WizardMode_Basic:
    127127        {
    128             setPage(Page1, new UIWizardNewVDPageBasic1);
     128            setPage(Page1, new UIWizardNewVDPageFileType);
    129129            setPage(Page2, new UIWizardNewVDPageBasic2);
    130130            setPage(Page3, new UIWizardNewVDPageBasic3(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));

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

    r88038 r88597  
    153153void UIWizardNewVDPageExpert::retranslateUi()
    154154{
    155     UIWizardNewVDPage1::retranslateWidgets();
     155    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    156156    UIWizardNewVDPage2::retranslateWidgets();
    157157    UIWizardNewVDPage3::retranslateWidgets();

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

    r87972 r88597  
    2323
    2424/* GUI includes: */
    25 #include "UIWizardNewVDPageBasic1.h"
     25#include "UIWizardNewVDPageFileType.h"
    2626#include "UIWizardNewVDPageBasic2.h"
    2727#include "UIWizardNewVDPageBasic3.h"
    … …  
    3232/* Expert page of the New Virtual Hard Drive wizard: */
    3333class SHARED_LIBRARY_STUFF UIWizardNewVDPageExpert : public UIWizardPage,
    34                                                      public UIWizardNewVDPage1,
     34                                                     public UIWizardNewVDPageBaseFileType,
    3535                                                     public UIWizardNewVDPage2,
    3636                                                     public UIWizardNewVDPage3

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

    r88596 r88597  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic1 class implementation.
     3 * VBox Qt GUI - UIWizardNewVDPageFileType class implementation.
    44 */
    55
    … …  
    2323/* GUI includes: */
    2424#include "UIConverter.h"
    25 #include "UIWizardNewVDPageBasic1.h"
     25#include "UIWizardNewVDPageFileType.h"
    2626#include "UIWizardNewVDPageBasic3.h"
    2727#include "UIWizardNewVD.h"
    … …  
    3333
    3434
    35 UIWizardNewVDPage1::UIWizardNewVDPage1()
     35UIWizardNewVDPageBaseFileType::UIWizardNewVDPageBaseFileType()
    3636    : m_pFormatButtonGroup(0)
    3737{
    3838}
    3939
    40 void UIWizardNewVDPage1::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat, bool fPreferred /* = false */)
     40void UIWizardNewVDPageBaseFileType::addFormatButton(QWidget *pParent, QVBoxLayout *pFormatLayout, CMediumFormat medFormat, bool fPreferred /* = false */)
    4141{
    4242    /* Check that medium format supports creation: */
    … …  
    7777}
    7878
    79 QWidget *UIWizardNewVDPage1::createFormatButtonGroup(bool fExpertMode)
     79QWidget *UIWizardNewVDPageBaseFileType::createFormatButtonGroup(bool fExpertMode)
    8080{
    8181    QWidget *pContainerWidget = new QWidget;
    … …  
    130130}
    131131
    132 CMediumFormat UIWizardNewVDPage1::mediumFormat() const
     132CMediumFormat UIWizardNewVDPageBaseFileType::mediumFormat() const
    133133{
    134134    return m_pFormatButtonGroup && m_pFormatButtonGroup->checkedButton() ? m_formats[m_pFormatButtonGroup->checkedId()] : CMediumFormat();
    135135}
    136136
    137 void UIWizardNewVDPage1::setMediumFormat(const CMediumFormat &mediumFormat)
     137void UIWizardNewVDPageBaseFileType::setMediumFormat(const CMediumFormat &mediumFormat)
    138138{
    139139    int iPosition = m_formats.indexOf(mediumFormat);
    … …  
    145145}
    146146
    147 void UIWizardNewVDPage1::retranslateWidgets()
     147void UIWizardNewVDPageBaseFileType::retranslateWidgets()
    148148{
    149149    if (m_pFormatButtonGroup)
    … …  
    159159}
    160160
    161 UIWizardNewVDPageBasic1::UIWizardNewVDPageBasic1()
     161UIWizardNewVDPageFileType::UIWizardNewVDPageFileType()
    162162{
    163163    /* Create widgets: */
    … …  
    173173    /* Setup connections: */
    174174    connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
    175             this, &UIWizardNewVDPageBasic1::completeChanged);
     175            this, &UIWizardNewVDPageFileType::completeChanged);
    176176
    177177    /* Register classes: */
    … …  
    181181}
    182182
    183 void UIWizardNewVDPageBasic1::retranslateUi()
     183void UIWizardNewVDPageFileType::retranslateUi()
    184184{
    185185    retranslateWidgets();
    … …  
    193193}
    194194
    195 void UIWizardNewVDPageBasic1::initializePage()
     195void UIWizardNewVDPageFileType::initializePage()
    196196{
    197197    /* Translate page: */
    … …  
    199199}
    200200
    201 bool UIWizardNewVDPageBasic1::isComplete() const
     201bool UIWizardNewVDPageFileType::isComplete() const
    202202{
    203203    /* Make sure medium format is correct: */
    … …  
    205205}
    206206
    207 int UIWizardNewVDPageBasic1::nextId() const
     207int UIWizardNewVDPageFileType::nextId() const
    208208{
    209209    /* Show variant page only if there is something to show: */

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

    r88596 r88597  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardNewVDPageBasic1 class declaration.
     3 * VBox Qt GUI - UIWizardNewVDPageFileType class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic1_h
    19 #define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic1_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageFileType_h
     19#define FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageFileType_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3737
    3838/* 1st page of the New Virtual Hard Drive wizard (base part): */
    39 class SHARED_LIBRARY_STUFF UIWizardNewVDPage1 : public UIWizardPageBase
     39class SHARED_LIBRARY_STUFF UIWizardNewVDPageBaseFileType : public UIWizardPageBase
    4040{
    4141protected:
    4242
    4343    /* Constructor: */
    44     UIWizardNewVDPage1();
     44    UIWizardNewVDPageBaseFileType();
    4545
    4646    /* Helping stuff: */
    … …  
    6363
    6464/* 1st page of the New Virtual Hard Drive wizard (basic extension): */
    65 class SHARED_LIBRARY_STUFF UIWizardNewVDPageBasic1 : public UIWizardPage, public UIWizardNewVDPage1
     65class SHARED_LIBRARY_STUFF UIWizardNewVDPageFileType : public UIWizardPage, public UIWizardNewVDPageBaseFileType
    6666{
    6767    Q_OBJECT;
    … …  
    7171
    7272    /* Constructor: */
    73     UIWizardNewVDPageBasic1();
     73    UIWizardNewVDPageFileType();
    7474
    7575private:
    … …  
    9292
    9393
    94 #endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageBasic1_h */
     94#endif /* !FEQT_INCLUDED_SRC_wizards_newvd_UIWizardNewVDPageFileType_h */

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

    r88577 r88597  
    309309
    310310    UIWizardNewVMPageDiskBase::retranslateWidgets();
    311     UIWizardNewVDPage1::retranslateWidgets();
     311    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    312312    UIWizardNewVDPage2::retranslateWidgets();
    313313    UIWizardNewVDPage3::retranslateWidgets();

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

    r88577 r88597  
    2727/* GUI includes: */
    2828#include "UIWizardPage.h"
    29 #include "UIWizardNewVDPageBasic1.h"
     29#include "UIWizardNewVDPageFileType.h"
    3030#include "UIWizardNewVDPageBasic2.h"
    3131#include "UIWizardNewVDPageBasic3.h"
    … …  
    8080class UIWizardNewVMPageDisk : public UIWizardPage,
    8181                                public UIWizardNewVMPageDiskBase,
    82                                 public UIWizardNewVDPage1,
     82                                public UIWizardNewVDPageBaseFileType,
    8383                                public UIWizardNewVDPage2,
    8484                                public UIWizardNewVDPage3

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

    r88577 r88597  
    158158    UIWizardNewVMPageHardwareBase::retranslateWidgets();
    159159    UIWizardNewVMPageDiskBase::retranslateWidgets();
    160     UIWizardNewVDPage1::retranslateWidgets();
     160    UIWizardNewVDPageBaseFileType::retranslateWidgets();
    161161    UIWizardNewVDPage2::retranslateWidgets();
    162162    UIWizardNewVDPage3::retranslateWidgets();

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

    r88577 r88597  
    4242                                public UIWizardNewVMPageHardwareBase,
    4343                                public UIWizardNewVMPageDiskBase,
    44                                 public UIWizardNewVDPage1,
     44                                public UIWizardNewVDPageBaseFileType,
    4545                                public UIWizardNewVDPage2,
    4646                                public UIWizardNewVDPage3
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