VirtualBox

Ignore:
Timestamp:
Jun 19, 2019 10:44:54 AM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9495: Make stuff represented in r131416 buildable.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r79236 r79238  
    325325        ./src/widgets/graphics \
    326326        ./src/wizards \
     327        ./src/wizards/newcloudvm \
    327328        ./src/wizards/newvm \
    328329        ./src/wizards/newvd \
    … …  
    676677        src/widgets/graphics/UIGraphicsToolBar.h \
    677678        src/widgets/graphics/UIGraphicsTextPane.h \
     679        src/wizards/newcloudvm/UIWizardNewCloudVM.h \
     680        src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.h \
     681        src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.h \
     682        src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h \
    678683        src/wizards/newvm/UIWizardNewVM.h \
    679684        src/wizards/newvm/UIWizardNewVMPageBasic1.h \
    … …  
    954959        src/widgets/UITabBar.cpp \
    955960        src/widgets/graphics/UIGraphicsScrollBar.cpp \
     961        src/wizards/newcloudvm/UIWizardNewCloudVM.cpp \
    956962        src/wizards/importappliance/UIWizardImportApp.cpp
    957963
    … …  
    11081114        src/widgets/graphics/UIGraphicsToolBar.cpp \
    11091115        src/widgets/graphics/UIGraphicsTextPane.cpp \
     1116        src/wizards/newcloudvm/UIWizardNewCloudVM.cpp \
     1117        src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp \
     1118        src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.cpp \
     1119        src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp \
    11101120        src/wizards/newvm/UIWizardNewVM.cpp \
    11111121        src/wizards/newvm/UIWizardNewVMPageBasic1.cpp \
    … …  
    19121922                wizards/firstrun \
    19131923                wizards/importappliance \
     1924                wizards/newcloudvm \
    19141925                wizards/newvd \
    19151926                wizards/newvm)

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.cpp

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportApp class implementation.
     3 * VBox Qt GUI - UIWizardNewCloudVM class implementation.
    44 */
    55
    … …  
    3131#include "VBoxGlobal.h"
    3232#include "UIMessageCenter.h"
    33 #include "UIWizardImportApp.h"
    34 #include "UIWizardImportAppPageBasic1.h"
    35 #include "UIWizardImportAppPageBasic2.h"
    36 #include "UIWizardImportAppPageExpert.h"
     33#include "UIWizardNewCloudVM.h"
     34#include "UIWizardNewCloudVMPageBasic1.h"
     35#include "UIWizardNewCloudVMPageBasic2.h"
     36#include "UIWizardNewCloudVMPageExpert.h"
    3737
    3838/* COM includes: */
    … …  
    4141
    4242/* Import license viewer: */
    43 class UIImportLicenseViewer : public QIDialog
     43class UINewCloudVMLicenseViewer : public QIDialog
    4444{
    4545    Q_OBJECT;
    … …  
    4848
    4949    /* Constructor: */
    50     UIImportLicenseViewer(QWidget *pParent)
     50    UINewCloudVMLicenseViewer(QWidget *pParent)
    5151        : QIDialog(pParent)
    5252    {
    … …  
    7272
    7373        /* Setup connections: */
    74         connect(m_pButtonBox, &QDialogButtonBox::rejected, this, &UIImportLicenseViewer::reject);
    75         connect(m_pButtonBox, &QDialogButtonBox::accepted, this, &UIImportLicenseViewer::accept);
    76         connect(m_pPrintButton, &QPushButton::clicked,     this, &UIImportLicenseViewer::sltPrint);
    77         connect(m_pSaveButton,  &QPushButton::clicked,     this, &UIImportLicenseViewer::sltSave);
     74        connect(m_pButtonBox, &QDialogButtonBox::rejected, this, &UINewCloudVMLicenseViewer::reject);
     75        connect(m_pButtonBox, &QDialogButtonBox::accepted, this, &UINewCloudVMLicenseViewer::accept);
     76        connect(m_pPrintButton, &QPushButton::clicked,     this, &UINewCloudVMLicenseViewer::sltPrint);
     77        connect(m_pSaveButton,  &QPushButton::clicked,     this, &UINewCloudVMLicenseViewer::sltSave);
    7878    }
    7979
    … …  
    143143
    144144/*********************************************************************************************************************************
    145 *   Class UIWizardImportApp implementation.                                                                                      *
     145*   Class UIWizardNewCloudVM implementation.                                                                                      *
    146146*********************************************************************************************************************************/
    147147
    148 UIWizardImportApp::UIWizardImportApp(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName)
     148UIWizardNewCloudVM::UIWizardNewCloudVM(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName)
    149149    : UIWizard(pParent, WizardType_ImportAppliance)
    150150    , m_fImportFromOCIByDefault(fImportFromOCIByDefault)
    … …  
    160160}
    161161
    162 void UIWizardImportApp::prepare()
     162void UIWizardNewCloudVM::prepare()
    163163{
    164164    /* Create corresponding pages: */
    … …  
    168168        {
    169169            if (m_fImportFromOCIByDefault || m_strFileName.isEmpty())
    170                 setPage(Page1, new UIWizardImportAppPageBasic1(m_fImportFromOCIByDefault));
    171             setPage(Page2, new UIWizardImportAppPageBasic2(m_strFileName));
     170                setPage(Page1, new UIWizardNewCloudVMPageBasic1(m_fImportFromOCIByDefault));
     171            setPage(Page2, new UIWizardNewCloudVMPageBasic2(m_strFileName));
    172172            break;
    173173        }
    174174        case WizardMode_Expert:
    175175        {
    176             setPage(PageExpert, new UIWizardImportAppPageExpert(m_fImportFromOCIByDefault, m_strFileName));
     176            setPage(PageExpert, new UIWizardNewCloudVMPageExpert(m_fImportFromOCIByDefault, m_strFileName));
    177177            break;
    178178        }
    … …  
    187187}
    188188
    189 bool UIWizardImportApp::isValid() const
     189bool UIWizardNewCloudVM::isValid() const
    190190{
    191191    bool fResult = false;
    … …  
    195195}
    196196
    197 bool UIWizardImportApp::importAppliance()
     197bool UIWizardNewCloudVM::importAppliance()
    198198{
    199199    /* Check whether there was cloud source selected: */
    … …  
    241241        if (!licAgreements.isEmpty())
    242242        {
    243             UIImportLicenseViewer ilv(this);
     243            UINewCloudVMLicenseViewer ilv(this);
    244244            for (int i = 0; i < licAgreements.size(); ++ i)
    245245            {
    … …  
    255255}
    256256
    257 void UIWizardImportApp::retranslateUi()
     257void UIWizardNewCloudVM::retranslateUi()
    258258{
    259259    /* Call to base-class: */
    … …  
    266266}
    267267
    268 void UIWizardImportApp::sltCurrentIdChanged(int iId)
     268void UIWizardNewCloudVM::sltCurrentIdChanged(int iId)
    269269{
    270270    /* Call to base-class: */
    … …  
    275275}
    276276
    277 void UIWizardImportApp::sltCustomButtonClicked(int iId)
     277void UIWizardNewCloudVM::sltCustomButtonClicked(int iId)
    278278{
    279279    /* Call to base-class: */
    … …  
    292292
    293293
    294 #include "UIWizardImportApp.moc"
     294#include "UIWizardNewCloudVM.moc"

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVM.h

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportApp class declaration.
     3 * VBox Qt GUI - UIWizardNewCloudVM class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportApp_h
    19 #define FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportApp_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVM_h
     19#define FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVM_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    2626
    2727/** Import Appliance wizard. */
    28 class UIWizardImportApp : public UIWizard
     28class UIWizardNewCloudVM : public UIWizard
    2929{
    3030    Q_OBJECT;
    … …  
    4747    /** Constructs export appliance wizard passing @a pParent to the base-class.
    4848      * @param  strFileName  Brings appliance file name. */
    49     UIWizardImportApp(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName);
     49    UIWizardNewCloudVM(QWidget *pParent, bool fImportFromOCIByDefault, const QString &strFileName);
    5050
    5151    /** Prepares all. */
    … …  
    7979
    8080/** Safe pointer to appliance wizard. */
    81 typedef QPointer<UIWizardImportApp> UISafePointerWizardImportApp;
     81typedef QPointer<UIWizardNewCloudVM> UISafePointerWizardImportApp;
    8282
    83 #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportApp_h */
     83#endif /* !FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVM_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageBasic1 class implementation.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageBasic1 class implementation.
    44 */
    55
    … …  
    3434#include "UIMessageCenter.h"
    3535#include "UIVirtualBoxManager.h"
    36 #include "UIWizardImportApp.h"
    37 #include "UIWizardImportAppPageBasic1.h"
    38 #include "UIWizardImportAppPageBasic2.h"
     36#include "UIWizardNewCloudVM.h"
     37#include "UIWizardNewCloudVMPageBasic1.h"
     38#include "UIWizardNewCloudVMPageBasic2.h"
    3939
    4040/* COM includes: */
    … …  
    4343
    4444/*********************************************************************************************************************************
    45 *   Class UIWizardImportAppPage1 implementation.                                                                                 *
     45*   Class UIWizardNewCloudVMPage1 implementation.                                                                                 *
    4646*********************************************************************************************************************************/
    4747
    48 UIWizardImportAppPage1::UIWizardImportAppPage1(bool fImportFromOCIByDefault)
     48UIWizardNewCloudVMPage1::UIWizardNewCloudVMPage1(bool fImportFromOCIByDefault)
    4949    : m_fImportFromOCIByDefault(fImportFromOCIByDefault)
    5050    , m_pSourceLayout(0)
    … …  
    6565}
    6666
    67 void UIWizardImportAppPage1::populateSources()
     67void UIWizardNewCloudVMPage1::populateSources()
    6868{
    6969    /* To be executed just once, so combo should be empty: */
    … …  
    130130}
    131131
    132 void UIWizardImportAppPage1::populateAccounts()
     132void UIWizardNewCloudVMPage1::populateAccounts()
    133133{
    134134    /* Block signals while updating: */
    … …  
    197197}
    198198
    199 void UIWizardImportAppPage1::populateAccountProperties()
     199void UIWizardNewCloudVMPage1::populateAccountProperties()
    200200{
    201201    /* Block signals while updating: */
    … …  
    290290}
    291291
    292 void UIWizardImportAppPage1::populateAccountInstances()
     292void UIWizardNewCloudVMPage1::populateAccountInstances()
    293293{
    294294    /* Block signals while updating: */
    … …  
    331331
    332332            /* Show "Acquire cloud instances" progress: */
    333             msgCenter().showModalProgressDialog(comProgress, UIWizardImportApp::tr("Acquire cloud instances..."),
     333            msgCenter().showModalProgressDialog(comProgress, UIWizardNewCloudVM::tr("Acquire cloud instances..."),
    334334                                                ":/progress_reading_appliance_90px.png", 0, 0);
    335335            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
    … …  
    364364}
    365365
    366 void UIWizardImportAppPage1::populateFormProperties()
     366void UIWizardNewCloudVMPage1::populateFormProperties()
    367367{
    368368    /* Clear appliance: */
    … …  
    398398
    399399            /* Show "Read appliance" progress: */
    400             msgCenter().showModalProgressDialog(comReadProgress, UIWizardImportApp::tr("Read appliance..."),
     400            msgCenter().showModalProgressDialog(comReadProgress, UIWizardNewCloudVM::tr("Read appliance..."),
    401401                                                ":/progress_reading_appliance_90px.png", 0, 0);
    402402            if (!comReadProgress.isOk() || comReadProgress.GetResultCode() != 0)
    … …  
    428428
    429429            /* Show "Acquire import form" progress: */
    430             msgCenter().showModalProgressDialog(comImportDescriptionFormProgress, UIWizardImportApp::tr("Acquire import form..."),
     430            msgCenter().showModalProgressDialog(comImportDescriptionFormProgress, UIWizardNewCloudVM::tr("Acquire import form..."),
    431431                                                ":/progress_reading_appliance_90px.png", 0, 0);
    432432            if (!comImportDescriptionFormProgress.isOk() || comImportDescriptionFormProgress.GetResultCode() != 0)
    … …  
    443443}
    444444
    445 void UIWizardImportAppPage1::updatePageAppearance()
     445void UIWizardNewCloudVMPage1::updatePageAppearance()
    446446{
    447447    /* Update page appearance according to chosen source: */
    … …  
    449449}
    450450
    451 void UIWizardImportAppPage1::updateSourceComboToolTip()
     451void UIWizardNewCloudVMPage1::updateSourceComboToolTip()
    452452{
    453453    const int iCurrentIndex = m_pSourceComboBox->currentIndex();
    … …  
    457457}
    458458
    459 void UIWizardImportAppPage1::updateAccountPropertyTableToolTips()
     459void UIWizardNewCloudVMPage1::updateAccountPropertyTableToolTips()
    460460{
    461461    /* Iterate through all the key items: */
    … …  
    467467        {
    468468            const QString strToolTip = pItemK->data(Qt::UserRole).toString();
    469             pItemK->setToolTip(QApplication::translate("UIWizardImportAppPageBasic1", strToolTip.toUtf8().constData()));
    470         }
    471     }
    472 }
    473 
    474 void UIWizardImportAppPage1::adjustAccountPropertyTable()
     469            pItemK->setToolTip(QApplication::translate("UIWizardNewCloudVMPageBasic1", strToolTip.toUtf8().constData()));
     470        }
     471    }
     472}
     473
     474void UIWizardNewCloudVMPage1::adjustAccountPropertyTable()
    475475{
    476476    /* Disable last column stretching temporary: */
    … …  
    489489}
    490490
    491 void UIWizardImportAppPage1::setSource(const QString &strSource)
     491void UIWizardNewCloudVMPage1::setSource(const QString &strSource)
    492492{
    493493    const int iIndex = m_pSourceComboBox->findData(strSource, SourceData_ShortName);
    … …  
    496496}
    497497
    498 QString UIWizardImportAppPage1::source() const
     498QString UIWizardNewCloudVMPage1::source() const
    499499{
    500500    const int iIndex = m_pSourceComboBox->currentIndex();
    … …  
    502502}
    503503
    504 bool UIWizardImportAppPage1::isSourceCloudOne(int iIndex /* = -1 */) const
     504bool UIWizardNewCloudVMPage1::isSourceCloudOne(int iIndex /* = -1 */) const
    505505{
    506506    if (iIndex == -1)
    … …  
    509509}
    510510
    511 QUuid UIWizardImportAppPage1::sourceId() const
     511QUuid UIWizardNewCloudVMPage1::sourceId() const
    512512{
    513513    const int iIndex = m_pSourceComboBox->currentIndex();
    … …  
    515515}
    516516
    517 QString UIWizardImportAppPage1::profileName() const
     517QString UIWizardNewCloudVMPage1::profileName() const
    518518{
    519519    const int iIndex = m_pAccountComboBox->currentIndex();
    … …  
    521521}
    522522
    523 QString UIWizardImportAppPage1::machineId() const
     523QString UIWizardNewCloudVMPage1::machineId() const
    524524{
    525525    QListWidgetItem *pItem = m_pAccountInstanceList->currentItem();
    … …  
    527527}
    528528
    529 CCloudProfile UIWizardImportAppPage1::profile() const
     529CCloudProfile UIWizardNewCloudVMPage1::profile() const
    530530{
    531531    return m_comCloudProfile;
    532532}
    533533
    534 CAppliance UIWizardImportAppPage1::appliance() const
     534CAppliance UIWizardNewCloudVMPage1::appliance() const
    535535{
    536536    return m_comAppliance;
    537537}
    538538
    539 CVirtualSystemDescriptionForm UIWizardImportAppPage1::vsdForm() const
     539CVirtualSystemDescriptionForm UIWizardNewCloudVMPage1::vsdForm() const
    540540{
    541541    return m_comVSDForm;
    … …  
    544544
    545545/*********************************************************************************************************************************
    546 *   Class UIWizardImportAppPageBasic1 implementation.                                                                            *
     546*   Class UIWizardNewCloudVMPageBasic1 implementation.                                                                            *
    547547*********************************************************************************************************************************/
    548548
    549 UIWizardImportAppPageBasic1::UIWizardImportAppPageBasic1(bool fImportFromOCIByDefault)
    550     : UIWizardImportAppPage1(fImportFromOCIByDefault)
     549UIWizardNewCloudVMPageBasic1::UIWizardNewCloudVMPageBasic1(bool fImportFromOCIByDefault)
     550    : UIWizardNewCloudVMPage1(fImportFromOCIByDefault)
    551551    , m_pLabelMain(0)
    552552    , m_pLabelDescription(0)
    … …  
    769769    if (gpManager)
    770770        connect(gpManager, &UIVirtualBoxManager::sigCloudProfileManagerChange,
    771                 this, &UIWizardImportAppPageBasic1::sltHandleSourceChange);
     771                this, &UIWizardNewCloudVMPageBasic1::sltHandleSourceChange);
    772772    connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
    773             this, &UIWizardImportAppPageBasic1::sltHandleSourceChange);
     773            this, &UIWizardNewCloudVMPageBasic1::sltHandleSourceChange);
    774774    connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,
    775             this, &UIWizardImportAppPageBasic1::completeChanged);
     775            this, &UIWizardNewCloudVMPageBasic1::completeChanged);
    776776    connect(m_pAccountComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    777             this, &UIWizardImportAppPageBasic1::sltHandleAccountComboChange);
     777            this, &UIWizardNewCloudVMPageBasic1::sltHandleAccountComboChange);
    778778    connect(m_pAccountToolButton, &QIToolButton::clicked,
    779             this, &UIWizardImportAppPageBasic1::sltHandleAccountButtonClick);
     779            this, &UIWizardNewCloudVMPageBasic1::sltHandleAccountButtonClick);
    780780    connect(m_pAccountInstanceList, &QListWidget::currentRowChanged,
    781             this, &UIWizardImportAppPageBasic1::completeChanged);
     781            this, &UIWizardNewCloudVMPageBasic1::completeChanged);
    782782
    783783    /* Register fields: */
    … …  
    790790}
    791791
    792 bool UIWizardImportAppPageBasic1::event(QEvent *pEvent)
     792bool UIWizardNewCloudVMPageBasic1::event(QEvent *pEvent)
    793793{
    794794    /* Handle known event types: */
    … …  
    810810}
    811811
    812 void UIWizardImportAppPageBasic1::retranslateUi()
     812void UIWizardNewCloudVMPageBasic1::retranslateUi()
    813813{
    814814    /* Translate page: */
    815     setTitle(UIWizardImportApp::tr("Appliance to import"));
     815    setTitle(UIWizardNewCloudVM::tr("Appliance to import"));
    816816
    817817    /* Translate main label: */
    818     m_pLabelMain->setText(UIWizardImportApp::tr("Please choose the source to import appliance from.  This can be a "
     818    m_pLabelMain->setText(UIWizardNewCloudVM::tr("Please choose the source to import appliance from.  This can be a "
    819819                                                "local file system to import OVF archive or one of known  cloud "
    820820                                                "service providers to import cloud VM from."));
    … …  
    823823    m_pSourceLabel->setText(tr("&Source:"));
    824824    /* Translate hardcoded values of Source combo-box: */
    825     m_pSourceComboBox->setItemText(0, UIWizardImportApp::tr("Local File System"));
    826     m_pSourceComboBox->setItemData(0, UIWizardImportApp::tr("Import from local file system."), Qt::ToolTipRole);
     825    m_pSourceComboBox->setItemText(0, UIWizardNewCloudVM::tr("Local File System"));
     826    m_pSourceComboBox->setItemData(0, UIWizardNewCloudVM::tr("Import from local file system."), Qt::ToolTipRole);
    827827    /* Translate received values of Source combo-box.
    828828     * We are enumerating starting from 0 for simplicity: */
    … …  
    831831        {
    832832            m_pSourceComboBox->setItemText(i, m_pSourceComboBox->itemData(i, SourceData_Name).toString());
    833             m_pSourceComboBox->setItemData(i, UIWizardImportApp::tr("Import from cloud service provider."), Qt::ToolTipRole);
     833            m_pSourceComboBox->setItemData(i, UIWizardNewCloudVM::tr("Import from cloud service provider."), Qt::ToolTipRole);
    834834        }
    835835
    836836    /* Translate local stuff: */
    837     m_pFileLabel->setText(UIWizardImportApp::tr("&File:"));
    838     m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import..."));
    839     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
    840     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
     837    m_pFileLabel->setText(UIWizardNewCloudVM::tr("&File:"));
     838    m_pFileSelector->setChooseButtonToolTip(UIWizardNewCloudVM::tr("Choose a virtual appliance file to import..."));
     839    m_pFileSelector->setFileDialogTitle(UIWizardNewCloudVM::tr("Please choose a virtual appliance file to import"));
     840    m_pFileSelector->setFileFilters(UIWizardNewCloudVM::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
    841841
    842842    /* Translate cloud stuff: */
    843     m_pAccountLabel->setText(UIWizardImportApp::tr("&Account:"));
    844     m_pAccountInstanceLabel->setText(UIWizardImportApp::tr("&Machines:"));
     843    m_pAccountLabel->setText(UIWizardNewCloudVM::tr("&Account:"));
     844    m_pAccountInstanceLabel->setText(UIWizardNewCloudVM::tr("&Machines:"));
    845845
    846846    /* Adjust label widths: */
    … …  
    865865}
    866866
    867 void UIWizardImportAppPageBasic1::initializePage()
     867void UIWizardNewCloudVMPageBasic1::initializePage()
    868868{
    869869    /* Translate page: */
    … …  
    871871}
    872872
    873 bool UIWizardImportAppPageBasic1::isComplete() const
     873bool UIWizardNewCloudVMPageBasic1::isComplete() const
    874874{
    875875    bool fResult = true;
    … …  
    893893}
    894894
    895 bool UIWizardImportAppPageBasic1::validatePage()
     895bool UIWizardNewCloudVMPageBasic1::validatePage()
    896896{
    897897    if (isSourceCloudOne())
    … …  
    923923}
    924924
    925 void UIWizardImportAppPageBasic1::updatePageAppearance()
     925void UIWizardNewCloudVMPageBasic1::updatePageAppearance()
    926926{
    927927    /* Call to base-class: */
    928     UIWizardImportAppPage1::updatePageAppearance();
     928    UIWizardNewCloudVMPage1::updatePageAppearance();
    929929
    930930    /* Update page appearance according to chosen storage-type: */
    931931    if (isSourceCloudOne())
    932932    {
    933         m_pLabelDescription->setText(UIWizardImportApp::
     933        m_pLabelDescription->setText(UIWizardNewCloudVM::
    934934                                     tr("<p>Please choose one of cloud service accounts you have registered to import virtual "
    935935                                        "machine from.  Corresponding machines list will be updated.  To continue, "
    … …  
    939939    else
    940940    {
    941         m_pLabelDescription->setText(UIWizardImportApp::
     941        m_pLabelDescription->setText(UIWizardNewCloudVM::
    942942                                     tr("<p>Please choose a file to import the virtual appliance from.  VirtualBox currently "
    943943                                        "supports importing appliances saved in the Open Virtualization Format (OVF).  "
    … …  
    947947}
    948948
    949 void UIWizardImportAppPageBasic1::sltHandleSourceChange()
     949void UIWizardNewCloudVMPageBasic1::sltHandleSourceChange()
    950950{
    951951    /* Update tool-tip: */
    … …  
    960960}
    961961
    962 void UIWizardImportAppPageBasic1::sltHandleAccountComboChange()
     962void UIWizardNewCloudVMPageBasic1::sltHandleAccountComboChange()
    963963{
    964964    /* Refresh required settings: */
    … …  
    968968}
    969969
    970 void UIWizardImportAppPageBasic1::sltHandleAccountButtonClick()
     970void UIWizardNewCloudVMPageBasic1::sltHandleAccountButtonClick()
    971971{
    972972    /* Open Cloud Profile Manager: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.h

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageBasic1 class declaration.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageBasic1 class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic1_h
    19 #define FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic1_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic1_h
     19#define FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic1_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    6161
    6262/** UIWizardPageBase extension for 1st page of the Import Appliance wizard. */
    63 class UIWizardImportAppPage1 : public UIWizardPageBase
     63class UIWizardNewCloudVMPage1 : public UIWizardPageBase
    6464{
    6565protected:
    6666
    6767    /** Constructs 1st page base. */
    68     UIWizardImportAppPage1(bool fImportFromOCIByDefault);
     68    UIWizardNewCloudVMPage1(bool fImportFromOCIByDefault);
    6969
    7070    /** Populates sources. */
    … …  
    158158};
    159159
    160 /** UIWizardPage extension for 1st page of the Import Appliance wizard, extends UIWizardImportAppPage1 as well. */
    161 class UIWizardImportAppPageBasic1 : public UIWizardPage, public UIWizardImportAppPage1
     160/** UIWizardPage extension for 1st page of the Import Appliance wizard, extends UIWizardNewCloudVMPage1 as well. */
     161class UIWizardNewCloudVMPageBasic1 : public UIWizardPage, public UIWizardNewCloudVMPage1
    162162{
    163163    Q_OBJECT;
    … …  
    172172
    173173    /** Constructs 1st basic page. */
    174     UIWizardImportAppPageBasic1(bool fImportFromOCIByDefault);
     174    UIWizardNewCloudVMPageBasic1(bool fImportFromOCIByDefault);
    175175
    176176protected:
    … …  
    213213};
    214214
    215 #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic1_h */
     215#endif /* !FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic1_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.cpp

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageBasic2 class implementation.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageBasic2 class implementation.
    44 */
    55
    … …  
    2626#include "UIApplianceUnverifiedCertificateViewer.h"
    2727#include "UIMessageCenter.h"
    28 #include "UIWizardImportApp.h"
    29 #include "UIWizardImportAppPageBasic2.h"
     28#include "UIWizardNewCloudVM.h"
     29#include "UIWizardNewCloudVMPageBasic2.h"
    3030
    3131/* COM includes: */
    … …  
    3636
    3737/*********************************************************************************************************************************
    38 *   Class UIWizardImportAppPage2 implementation.                                                                                 *
     38*   Class UIWizardNewCloudVMPage2 implementation.                                                                                 *
    3939*********************************************************************************************************************************/
    4040
    41 UIWizardImportAppPage2::UIWizardImportAppPage2()
     41UIWizardNewCloudVMPage2::UIWizardNewCloudVMPage2()
    4242    : m_pSettingsCntLayout(0)
    4343{
    4444}
    4545
    46 void UIWizardImportAppPage2::updatePageAppearance()
     46void UIWizardNewCloudVMPage2::updatePageAppearance()
    4747{
    4848    /* Check whether there was cloud source selected: */
    … …  
    5252}
    5353
    54 void UIWizardImportAppPage2::refreshFormPropertiesTable()
     54void UIWizardNewCloudVMPage2::refreshFormPropertiesTable()
    5555{
    5656    /* Acquire VSD form: */
    … …  
    6363
    6464/*********************************************************************************************************************************
    65 *   Class UIWizardImportAppPageBasic2 implementation.                                                                            *
     65*   Class UIWizardNewCloudVMPageBasic2 implementation.                                                                            *
    6666*********************************************************************************************************************************/
    6767
    68 UIWizardImportAppPageBasic2::UIWizardImportAppPageBasic2(const QString &strFileName)
     68UIWizardNewCloudVMPageBasic2::UIWizardNewCloudVMPageBasic2(const QString &strFileName)
    6969    : m_enmCertText(kCertText_Uninitialized)
    7070{
    … …  
    153153}
    154154
    155 void UIWizardImportAppPageBasic2::retranslateUi()
     155void UIWizardNewCloudVMPageBasic2::retranslateUi()
    156156{
    157157    /* Translate page: */
    158     setTitle(UIWizardImportApp::tr("Appliance settings"));
     158    setTitle(UIWizardNewCloudVM::tr("Appliance settings"));
    159159
    160160    /* Update page appearance: */
    … …  
    165165    {
    166166        case kCertText_Unsigned:
    167             m_pCertLabel->setText(UIWizardImportApp::tr("Appliance is not signed"));
     167            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Appliance is not signed"));
    168168            break;
    169169        case kCertText_IssuedTrusted:
    170             m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (trusted)").arg(m_strSignedBy));
     170            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Appliance signed by %1 (trusted)").arg(m_strSignedBy));
    171171            break;
    172172        case kCertText_IssuedExpired:
    173             m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (expired!)").arg(m_strSignedBy));
     173            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Appliance signed by %1 (expired!)").arg(m_strSignedBy));
    174174            break;
    175175        case kCertText_IssuedUnverified:
    176             m_pCertLabel->setText(UIWizardImportApp::tr("Unverified signature by %1!").arg(m_strSignedBy));
     176            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Unverified signature by %1!").arg(m_strSignedBy));
    177177            break;
    178178        case kCertText_SelfSignedTrusted:
    179             m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (trusted)").arg(m_strSignedBy));
     179            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Self signed by %1 (trusted)").arg(m_strSignedBy));
    180180            break;
    181181        case kCertText_SelfSignedExpired:
    182             m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (expired!)").arg(m_strSignedBy));
     182            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Self signed by %1 (expired!)").arg(m_strSignedBy));
    183183            break;
    184184        case kCertText_SelfSignedUnverified:
    185             m_pCertLabel->setText(UIWizardImportApp::tr("Unverified self signed signature by %1!").arg(m_strSignedBy));
     185            m_pCertLabel->setText(UIWizardNewCloudVM::tr("Unverified self signed signature by %1!").arg(m_strSignedBy));
    186186            break;
    187187        default:
    … …  
    194194}
    195195
    196 void UIWizardImportAppPageBasic2::initializePage()
     196void UIWizardNewCloudVMPageBasic2::initializePage()
    197197{
    198198    /* Update widget visibility: */
    … …  
    266266}
    267267
    268 void UIWizardImportAppPageBasic2::cleanupPage()
     268void UIWizardNewCloudVMPageBasic2::cleanupPage()
    269269{
    270270    /* Rollback settings: */
    … …  
    274274}
    275275
    276 bool UIWizardImportAppPageBasic2::validatePage()
     276bool UIWizardNewCloudVMPageBasic2::validatePage()
    277277{
    278278    /* Initial result: */
    … …  
    303303    /* Try to import appliance: */
    304304    if (fResult)
    305         fResult = qobject_cast<UIWizardImportApp*>(wizard())->importAppliance();
     305        fResult = qobject_cast<UIWizardNewCloudVM*>(wizard())->importAppliance();
    306306
    307307    /* Unlock finish button: */
    … …  
    312312}
    313313
    314 void UIWizardImportAppPageBasic2::updatePageAppearance()
     314void UIWizardNewCloudVMPageBasic2::updatePageAppearance()
    315315{
    316316    /* Call to base-class: */
    317     UIWizardImportAppPage2::updatePageAppearance();
     317    UIWizardNewCloudVMPage2::updatePageAppearance();
    318318
    319319    /* Check whether there was cloud source selected: */
    … …  
    321321    if (fIsSourceCloudOne)
    322322    {
    323         m_pLabel->setText(UIWizardImportApp::tr("These are the the suggested settings of the cloud VM import "
     323        m_pLabel->setText(UIWizardNewCloudVM::tr("These are the the suggested settings of the cloud VM import "
    324324                                                "procedure, they are influencing the resulting local VM instance. "
    325325                                                "You can change many of the properties shown by double-clicking "
    … …  
    329329    else
    330330    {
    331         m_pLabel->setText(UIWizardImportApp::tr("These are the virtual machines contained in the appliance "
     331        m_pLabel->setText(UIWizardNewCloudVM::tr("These are the virtual machines contained in the appliance "
    332332                                                "and the suggested settings of the imported VirtualBox machines. "
    333333                                                "You can change many of the properties shown by double-clicking "

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic2.h

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageBasic2 class declaration.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageBasic2 class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic2_h
    19 #define FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic2_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic2_h
     19#define FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic2_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3333
    3434/** UIWizardPageBase extension for 2nd page of the Import Appliance wizard. */
    35 class UIWizardImportAppPage2 : public UIWizardPageBase
     35class UIWizardNewCloudVMPage2 : public UIWizardPageBase
    3636{
    3737protected:
    3838
    3939    /** Constructs 2nd page base. */
    40     UIWizardImportAppPage2();
     40    UIWizardNewCloudVMPage2();
    4141
    4242    /** Updates page appearance. */
    … …  
    5858};
    5959
    60 /** UIWizardPage extension for 2nd page of the Import Appliance wizard, extends UIWizardImportAppPage2 as well. */
    61 class UIWizardImportAppPageBasic2 : public UIWizardPage, public UIWizardImportAppPage2
     60/** UIWizardPage extension for 2nd page of the Import Appliance wizard, extends UIWizardNewCloudVMPage2 as well. */
     61class UIWizardNewCloudVMPageBasic2 : public UIWizardPage, public UIWizardNewCloudVMPage2
    6262{
    6363    Q_OBJECT;
    … …  
    6868    /** Constructs 2nd basic page.
    6969      * @param  strFileName  Brings appliance file name. */
    70     UIWizardImportAppPageBasic2(const QString &strFileName);
     70    UIWizardNewCloudVMPageBasic2(const QString &strFileName);
    7171
    7272protected:
    … …  
    108108};
    109109
    110 #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic2_h */
     110#endif /* !FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageBasic2_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageExpert class implementation.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageExpert class implementation.
    44 */
    55
    … …  
    3535#include "UIMessageCenter.h"
    3636#include "UIVirtualBoxManager.h"
    37 #include "UIWizardImportApp.h"
    38 #include "UIWizardImportAppPageExpert.h"
    39 
    40 
    41 UIWizardImportAppPageExpert::UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName)
    42     : UIWizardImportAppPage1(fImportFromOCIByDefault)
     37#include "UIWizardNewCloudVM.h"
     38#include "UIWizardNewCloudVMPageExpert.h"
     39
     40
     41UIWizardNewCloudVMPageExpert::UIWizardNewCloudVMPageExpert(bool fImportFromOCIByDefault, const QString &strFileName)
     42    : UIWizardNewCloudVMPage1(fImportFromOCIByDefault)
    4343    , m_pCntSource(0)
    4444    , m_pSettingsCnt(0)
    … …  
    263263    if (gpManager)
    264264        connect(gpManager, &UIVirtualBoxManager::sigCloudProfileManagerChange,
    265                 this, &UIWizardImportAppPageExpert::sltHandleSourceChange);
     265                this, &UIWizardNewCloudVMPageExpert::sltHandleSourceChange);
    266266    connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
    267             this, &UIWizardImportAppPageExpert::sltHandleSourceChange);
     267            this, &UIWizardNewCloudVMPageExpert::sltHandleSourceChange);
    268268    connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,
    269             this, &UIWizardImportAppPageExpert::sltFilePathChangeHandler);
     269            this, &UIWizardNewCloudVMPageExpert::sltFilePathChangeHandler);
    270270    connect(m_pAccountComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
    271             this, &UIWizardImportAppPageExpert::sltHandleAccountComboChange);
     271            this, &UIWizardNewCloudVMPageExpert::sltHandleAccountComboChange);
    272272    connect(m_pAccountToolButton, &QIToolButton::clicked,
    273             this, &UIWizardImportAppPageExpert::sltHandleAccountButtonClick);
     273            this, &UIWizardNewCloudVMPageExpert::sltHandleAccountButtonClick);
    274274    connect(m_pAccountInstanceList, &QListWidget::currentRowChanged,
    275             this, &UIWizardImportAppPageExpert::sltHandleInstanceListChange);
     275            this, &UIWizardNewCloudVMPageExpert::sltHandleInstanceListChange);
    276276
    277277    /* Register classes: */
    … …  
    287287}
    288288
    289 bool UIWizardImportAppPageExpert::event(QEvent *pEvent)
     289bool UIWizardNewCloudVMPageExpert::event(QEvent *pEvent)
    290290{
    291291    /* Handle known event types: */
    … …  
    307307}
    308308
    309 void UIWizardImportAppPageExpert::retranslateUi()
     309void UIWizardNewCloudVMPageExpert::retranslateUi()
    310310{
    311311    /* Translate appliance container: */
    312     m_pCntSource->setTitle(UIWizardImportApp::tr("Source"));
     312    m_pCntSource->setTitle(UIWizardNewCloudVM::tr("Source"));
    313313
    314314    /* Translate hardcoded values of Source combo-box: */
    315     m_pSourceComboBox->setItemText(0, UIWizardImportApp::tr("Local File System"));
    316     m_pSourceComboBox->setItemData(0, UIWizardImportApp::tr("Import from local file system."), Qt::ToolTipRole);
     315    m_pSourceComboBox->setItemText(0, UIWizardNewCloudVM::tr("Local File System"));
     316    m_pSourceComboBox->setItemData(0, UIWizardNewCloudVM::tr("Import from local file system."), Qt::ToolTipRole);
    317317    /* Translate received values of Source combo-box.
    318318     * We are enumerating starting from 0 for simplicity: */
    … …  
    321321        {
    322322            m_pSourceComboBox->setItemText(i, m_pSourceComboBox->itemData(i, SourceData_Name).toString());
    323             m_pSourceComboBox->setItemData(i, UIWizardImportApp::tr("Import from cloud service provider."), Qt::ToolTipRole);
     323            m_pSourceComboBox->setItemData(i, UIWizardNewCloudVM::tr("Import from cloud service provider."), Qt::ToolTipRole);
    324324        }
    325325
    326326    /* Translate file selector: */
    327     m_pFileSelector->setChooseButtonToolTip(UIWizardImportApp::tr("Choose a virtual appliance file to import..."));
    328     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
    329     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
     327    m_pFileSelector->setChooseButtonToolTip(UIWizardNewCloudVM::tr("Choose a virtual appliance file to import..."));
     328    m_pFileSelector->setFileDialogTitle(UIWizardNewCloudVM::tr("Please choose a virtual appliance file to import"));
     329    m_pFileSelector->setFileFilters(UIWizardNewCloudVM::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
    330330
    331331    /* Translate settings container: */
    332     m_pSettingsCnt->setTitle(UIWizardImportApp::tr("Settings"));
     332    m_pSettingsCnt->setTitle(UIWizardNewCloudVM::tr("Settings"));
    333333
    334334    /* Update page appearance: */
    … …  
    340340}
    341341
    342 void UIWizardImportAppPageExpert::initializePage()
     342void UIWizardNewCloudVMPageExpert::initializePage()
    343343{
    344344    /* Translate page: */
    … …  
    346346}
    347347
    348 bool UIWizardImportAppPageExpert::isComplete() const
     348bool UIWizardNewCloudVMPageExpert::isComplete() const
    349349{
    350350    bool fResult = true;
    … …  
    371371}
    372372
    373 bool UIWizardImportAppPageExpert::validatePage()
     373bool UIWizardNewCloudVMPageExpert::validatePage()
    374374{
    375375    /* Initial result: */
    … …  
    400400    /* Try to import appliance: */
    401401    if (fResult)
    402         fResult = qobject_cast<UIWizardImportApp*>(wizard())->importAppliance();
     402        fResult = qobject_cast<UIWizardNewCloudVM*>(wizard())->importAppliance();
    403403
    404404    /* Unlock finish button: */
    … …  
    409409}
    410410
    411 void UIWizardImportAppPageExpert::updatePageAppearance()
     411void UIWizardNewCloudVMPageExpert::updatePageAppearance()
    412412{
    413413    /* Call to base-class: */
    414     UIWizardImportAppPage1::updatePageAppearance();
    415     UIWizardImportAppPage2::updatePageAppearance();
     414    UIWizardNewCloudVMPage1::updatePageAppearance();
     415    UIWizardNewCloudVMPage2::updatePageAppearance();
    416416
    417417    /* Update page appearance according to chosen storage-type: */
    … …  
    422422}
    423423
    424 void UIWizardImportAppPageExpert::sltHandleSourceChange()
     424void UIWizardNewCloudVMPageExpert::sltHandleSourceChange()
    425425{
    426426    /* Update tool-tip: */
    … …  
    437437}
    438438
    439 void UIWizardImportAppPageExpert::sltFilePathChangeHandler()
     439void UIWizardNewCloudVMPageExpert::sltFilePathChangeHandler()
    440440{
    441441    /* Check if set file contains valid appliance: */
    … …  
    450450}
    451451
    452 void UIWizardImportAppPageExpert::sltHandleAccountComboChange()
     452void UIWizardNewCloudVMPageExpert::sltHandleAccountComboChange()
    453453{
    454454    /* Refresh required settings: */
    … …  
    460460}
    461461
    462 void UIWizardImportAppPageExpert::sltHandleAccountButtonClick()
     462void UIWizardNewCloudVMPageExpert::sltHandleAccountButtonClick()
    463463{
    464464    /* Open Cloud Profile Manager: */
    … …  
    467467}
    468468
    469 void UIWizardImportAppPageExpert::sltHandleInstanceListChange()
     469void UIWizardNewCloudVMPageExpert::sltHandleInstanceListChange()
    470470{
    471471    populateFormProperties();

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.h

    r79237 r79238  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardImportAppPageExpert class declaration.
     3 * VBox Qt GUI - UIWizardNewCloudVMPageExpert class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageExpert_h
    19 #define FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageExpert_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageExpert_h
     19#define FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageExpert_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    2323
    2424/* GUI includes: */
    25 #include "UIWizardImportAppPageBasic1.h"
    26 #include "UIWizardImportAppPageBasic2.h"
     25#include "UIWizardNewCloudVMPageBasic1.h"
     26#include "UIWizardNewCloudVMPageBasic2.h"
    2727
    2828/* Forward declarations: */
    2929class QGroupBox;
    3030
    31 /** UIWizardPage extension for UIWizardImportAppPage1 and UIWizardImportAppPage2. */
    32 class UIWizardImportAppPageExpert : public UIWizardPage,
    33                                     public UIWizardImportAppPage1,
    34                                     public UIWizardImportAppPage2
     31/** UIWizardPage extension for UIWizardNewCloudVMPage1 and UIWizardNewCloudVMPage2. */
     32class UIWizardNewCloudVMPageExpert : public UIWizardPage,
     33                                    public UIWizardNewCloudVMPage1,
     34                                    public UIWizardNewCloudVMPage2
    3535{
    3636    Q_OBJECT;
    … …  
    4747    /** Constructs expert page.
    4848      * @param  strFileName  Brings appliance file name. */
    49     UIWizardImportAppPageExpert(bool fImportFromOCIByDefault, const QString &strFileName);
     49    UIWizardNewCloudVMPageExpert(bool fImportFromOCIByDefault, const QString &strFileName);
    5050
    5151protected:
    … …  
    9696};
    9797
    98 #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageExpert_h */
     98#endif /* !FEQT_INCLUDED_SRC_wizards_newcloudvm_UIWizardNewCloudVMPageExpert_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