VirtualBox

Ignore:
Timestamp:
Oct 13, 2021 10:43:17 AM (3 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9996: Rename pages for UIWizardExportApp.

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

Legend:

Unmodified
Added
Removed

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

    r91656 r91707  
    678678        src/wizards/clonevd/UIWizardCloneVDExpertPage.h \
    679679        src/wizards/exportappliance/UIWizardExportApp.h \
    680         src/wizards/exportappliance/UIWizardExportAppPageBasic1.h \
    681         src/wizards/exportappliance/UIWizardExportAppPageBasic2.h \
    682         src/wizards/exportappliance/UIWizardExportAppPageBasic3.h \
    683680        src/wizards/exportappliance/UIWizardExportAppPageExpert.h \
     681        src/wizards/exportappliance/UIWizardExportAppPageFormat.h \
     682        src/wizards/exportappliance/UIWizardExportAppPageSettings.h \
     683        src/wizards/exportappliance/UIWizardExportAppPageVMs.h \
    684684        src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h \
    685685        src/wizards/importappliance/UIWizardImportApp.h \
    … …  
    11881188        src/wizards/clonevd/UIWizardCloneVDExpertPage.cpp \
    11891189        src/wizards/exportappliance/UIWizardExportApp.cpp \
    1190         src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp \
    1191         src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp \
    1192         src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp \
    11931190        src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp \
     1191        src/wizards/exportappliance/UIWizardExportAppPageFormat.cpp \
     1192        src/wizards/exportappliance/UIWizardExportAppPageSettings.cpp \
     1193        src/wizards/exportappliance/UIWizardExportAppPageVMs.cpp \
    11941194        src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp \
    11951195        src/wizards/importappliance/UIWizardImportApp.cpp \

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

    r91467 r91707  
    2828#include "UIProgressObject.h"
    2929#include "UIWizardExportApp.h"
    30 #include "UIWizardExportAppPageBasic1.h"
    31 #include "UIWizardExportAppPageBasic2.h"
    32 #include "UIWizardExportAppPageBasic3.h"
    3330#include "UIWizardExportAppPageExpert.h"
     31#include "UIWizardExportAppPageFormat.h"
     32#include "UIWizardExportAppPageSettings.h"
     33#include "UIWizardExportAppPageVMs.h"
    3434
    3535/* COM includes: */
    … …  
    443443        case WizardMode_Basic:
    444444        {
    445             addPage(new UIWizardExportAppPageBasic1(m_predefinedMachineNames, m_fFastTraverToExportOCI));
    446             addPage(new UIWizardExportAppPageBasic2(m_fFastTraverToExportOCI));
    447             addPage(new UIWizardExportAppPageBasic3);
     445            addPage(new UIWizardExportAppPageVMs(m_predefinedMachineNames, m_fFastTraverToExportOCI));
     446            addPage(new UIWizardExportAppPageFormat(m_fFastTraverToExportOCI));
     447            addPage(new UIWizardExportAppPageSettings);
    448448            break;
    449449        }

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

    r91663 r91707  
    4444#include "UIVirtualBoxManager.h"
    4545#include "UIWizardExportApp.h"
    46 #include "UIWizardExportAppPageBasic1.h"
    47 #include "UIWizardExportAppPageBasic2.h"
    48 #include "UIWizardExportAppPageBasic3.h"
    4946#include "UIWizardExportAppPageExpert.h"
     47#include "UIWizardExportAppPageFormat.h"
     48#include "UIWizardExportAppPageSettings.h"
     49#include "UIWizardExportAppPageVMs.h"
    5050
    5151/* Namespaces: */
    52 using namespace UIWizardExportAppPage1;
    53 using namespace UIWizardExportAppPage2;
    54 using namespace UIWizardExportAppPage3;
     52using namespace UIWizardExportAppFormat;
     53using namespace UIWizardExportAppSettings;
     54using namespace UIWizardExportAppVMs;
    5555
    5656
    … …  
    428428
    429429    /* Translate tool-box: */
    430     m_pToolBox->setPageTitle(0, UIWizardExportApp::tr("Virtual &machines to export"));
    431     m_pToolBox->setPageTitle(1, UIWizardExportApp::tr("Virtual &system settings"));
    432     m_pToolBox->setPageTitle(2, UIWizardExportApp::tr("Appliance settings"));
     430    m_pToolBox->setPageTitle(0, UIWizardExportApp::tr("Virtual &machines"));
     431    m_pToolBox->setPageTitle(1, UIWizardExportApp::tr("Format &settings"));
     432    m_pToolBox->setPageTitle(2, UIWizardExportApp::tr("&Appliance settings"));
    433433
    434434    /* Translate File selector: */
    … …  
    700700
    701701    /* Refresh settings widget state: */
    702     UIWizardExportAppPage2::refreshStackedWidget(m_pSettingsWidget1, wizard()->isFormatCloudOne());
    703     UIWizardExportAppPage3::refreshStackedWidget(m_pSettingsWidget2, wizard()->isFormatCloudOne());
     702    UIWizardExportAppFormat::refreshStackedWidget(m_pSettingsWidget1, wizard()->isFormatCloudOne());
     703    UIWizardExportAppSettings::refreshStackedWidget(m_pSettingsWidget2, wizard()->isFormatCloudOne());
    704704
    705705    /* Update export settings: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

    r91663 r91707  
    5151class UIWizardExportApp;
    5252
    53 /** UIWizardPage extension for UIWizardExportAppPage1, UIWizardExportAppPage2 and UIWizardExportAppPage3. */
     53/** UIWizardPage extension for UIWizardExportAppVMs, UIWizardExportAppFormat and UIWizardExportAppSettings. */
    5454class UIWizardExportAppPageExpert : public UINativeWizardPage
    5555{

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageFormat.cpp

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic2 class implementation.
     3 * VBox Qt GUI - UIWizardExportAppPageFormat class implementation.
    44 */
    55
    … …  
    3838#include "UIVirtualBoxManager.h"
    3939#include "UIWizardExportApp.h"
    40 #include "UIWizardExportAppPageBasic2.h"
     40#include "UIWizardExportAppPageFormat.h"
    4141
    4242/* COM includes: */
    … …  
    4545
    4646/* Namespaces: */
    47 using namespace UIWizardExportAppPage2;
     47using namespace UIWizardExportAppFormat;
    4848
    4949
    5050/*********************************************************************************************************************************
    51 *   Class UIWizardExportAppPage2 implementation.                                                                                 *
     51*   Class UIWizardExportAppFormat implementation.                                                                                *
    5252*********************************************************************************************************************************/
    5353
    54 void UIWizardExportAppPage2::populateFormats(QIComboBox *pCombo, bool fExportToOCIByDefault)
     54void UIWizardExportAppFormat::populateFormats(QIComboBox *pCombo, bool fExportToOCIByDefault)
    5555{
    5656    /* Sanity check: */
    … …  
    129129}
    130130
    131 void UIWizardExportAppPage2::populateMACAddressPolicies(QIComboBox *pCombo)
     131void UIWizardExportAppFormat::populateMACAddressPolicies(QIComboBox *pCombo)
    132132{
    133133    /* Sanity check: */
    … …  
    189189}
    190190
    191 QString UIWizardExportAppPage2::format(QIComboBox *pCombo)
     191QString UIWizardExportAppFormat::format(QIComboBox *pCombo)
    192192{
    193193    /* Sanity check: */
    … …  
    198198}
    199199
    200 bool UIWizardExportAppPage2::isFormatCloudOne(QIComboBox *pCombo, int iIndex /* = -1 */)
     200bool UIWizardExportAppFormat::isFormatCloudOne(QIComboBox *pCombo, int iIndex /* = -1 */)
    201201{
    202202    /* Sanity check: */
    … …  
    211211}
    212212
    213 void UIWizardExportAppPage2::refreshStackedWidget(QStackedWidget *pStackedWidget, bool fIsFormatCloudOne)
     213void UIWizardExportAppFormat::refreshStackedWidget(QStackedWidget *pStackedWidget, bool fIsFormatCloudOne)
    214214{
    215215    /* Update stack appearance according to chosen format: */
    … …  
    217217}
    218218
    219 void UIWizardExportAppPage2::refreshFileSelectorName(QString &strFileSelectorName,
    220                                                      const QStringList &machineNames,
    221                                                      const QString &strDefaultApplianceName,
    222                                                      bool fIsFormatCloudOne)
     219void UIWizardExportAppFormat::refreshFileSelectorName(QString &strFileSelectorName,
     220                                                      const QStringList &machineNames,
     221                                                      const QString &strDefaultApplianceName,
     222                                                      bool fIsFormatCloudOne)
    223223{
    224224    /* If format is cloud one: */
    … …  
    240240}
    241241
    242 void UIWizardExportAppPage2::refreshFileSelectorExtension(QString &strFileSelectorExt,
    243                                                           UIEmptyFilePathSelector *pFileSelector,
    244                                                           bool fIsFormatCloudOne)
     242void UIWizardExportAppFormat::refreshFileSelectorExtension(QString &strFileSelectorExt,
     243                                                           UIEmptyFilePathSelector *pFileSelector,
     244                                                           bool fIsFormatCloudOne)
    245245{
    246246    /* If format is cloud one: */
    … …  
    265265}
    266266
    267 void UIWizardExportAppPage2::refreshFileSelectorPath(UIEmptyFilePathSelector *pFileSelector,
    268                                                      const QString &strFileSelectorName,
    269                                                      const QString &strFileSelectorExt,
    270                                                      bool fIsFormatCloudOne)
     267void UIWizardExportAppFormat::refreshFileSelectorPath(UIEmptyFilePathSelector *pFileSelector,
     268                                                      const QString &strFileSelectorName,
     269                                                      const QString &strFileSelectorExt,
     270                                                      bool fIsFormatCloudOne)
    271271{
    272272    /* If format is cloud one: */
    … …  
    287287}
    288288
    289 void UIWizardExportAppPage2::refreshManifestCheckBoxAccess(QCheckBox *pCheckBox,
    290                                                            bool fIsFormatCloudOne)
     289void UIWizardExportAppFormat::refreshManifestCheckBoxAccess(QCheckBox *pCheckBox,
     290                                                            bool fIsFormatCloudOne)
    291291{
    292292    /* If format is cloud one: */
    … …  
    306306}
    307307
    308 void UIWizardExportAppPage2::refreshIncludeISOsCheckBoxAccess(QCheckBox *pCheckBox,
    309                                                               bool fIsFormatCloudOne)
     308void UIWizardExportAppFormat::refreshIncludeISOsCheckBoxAccess(QCheckBox *pCheckBox,
     309                                                               bool fIsFormatCloudOne)
    310310{
    311311    /* If format is cloud one: */
    … …  
    324324}
    325325
    326 void UIWizardExportAppPage2::refreshLocalStuff(CAppliance &comLocalAppliance,
    327                                                const QList<QUuid> &machineIDs,
    328                                                const QString &strUri)
     326void UIWizardExportAppFormat::refreshLocalStuff(CAppliance &comLocalAppliance,
     327                                                const QList<QUuid> &machineIDs,
     328                                                const QString &strUri)
    329329{
    330330    /* Clear stuff: */
    … …  
    365365}
    366366
    367 void UIWizardExportAppPage2::refreshProfileCombo(QIComboBox *pCombo,
    368                                                  const QString &strFormat,
    369                                                  bool fIsFormatCloudOne)
     367void UIWizardExportAppFormat::refreshProfileCombo(QIComboBox *pCombo,
     368                                                  const QString &strFormat,
     369                                                  bool fIsFormatCloudOne)
    370370{
    371371    /* Sanity check: */
    … …  
    437437}
    438438
    439 void UIWizardExportAppPage2::refreshCloudProfile(CCloudProfile &comCloudProfile,
    440                                                  const QString &strShortProviderName,
    441                                                  const QString &strProfileName,
    442                                                  bool fIsFormatCloudOne)
     439void UIWizardExportAppFormat::refreshCloudProfile(CCloudProfile &comCloudProfile,
     440                                                  const QString &strShortProviderName,
     441                                                  const QString &strProfileName,
     442                                                  bool fIsFormatCloudOne)
    443443{
    444444    /* If format is cloud one: */
    … …  
    450450}
    451451
    452 void UIWizardExportAppPage2::refreshCloudExportMode(const QMap<CloudExportMode, QAbstractButton*> &radios,
    453                                                     bool fIsFormatCloudOne)
     452void UIWizardExportAppFormat::refreshCloudExportMode(const QMap<CloudExportMode, QAbstractButton*> &radios,
     453                                                     bool fIsFormatCloudOne)
    454454{
    455455    /* If format is cloud one: */
    … …  
    474474}
    475475
    476 void UIWizardExportAppPage2::refreshCloudStuff(CAppliance &comCloudAppliance,
    477                                                CCloudClient &comCloudClient,
    478                                                CVirtualSystemDescription &comCloudVsd,
    479                                                CVirtualSystemDescriptionForm &comCloudVsdExportForm,
    480                                                const CCloudProfile &comCloudProfile,
    481                                                const QList<QUuid> &machineIDs,
    482                                                const QString &strUri,
    483                                                const CloudExportMode enmCloudExportMode)
     476void UIWizardExportAppFormat::refreshCloudStuff(CAppliance &comCloudAppliance,
     477                                                CCloudClient &comCloudClient,
     478                                                CVirtualSystemDescription &comCloudVsd,
     479                                                CVirtualSystemDescriptionForm &comCloudVsdExportForm,
     480                                                const CCloudProfile &comCloudProfile,
     481                                                const QList<QUuid> &machineIDs,
     482                                                const QString &strUri,
     483                                                const CloudExportMode enmCloudExportMode)
    484484{
    485485    /* Clear stuff: */
    … …  
    564564}
    565565
    566 QString UIWizardExportAppPage2::profileName(QIComboBox *pCombo)
     566QString UIWizardExportAppFormat::profileName(QIComboBox *pCombo)
    567567{
    568568    return pCombo->currentData(ProfileData_Name).toString();
    569569}
    570570
    571 void UIWizardExportAppPage2::updateFormatComboToolTip(QIComboBox *pCombo)
     571void UIWizardExportAppFormat::updateFormatComboToolTip(QIComboBox *pCombo)
    572572{
    573573    AssertPtrReturnVoid(pCombo);
    … …  
    581581}
    582582
    583 void UIWizardExportAppPage2::updateMACAddressExportPolicyComboToolTip(QIComboBox *pCombo)
     583void UIWizardExportAppFormat::updateMACAddressExportPolicyComboToolTip(QIComboBox *pCombo)
    584584{
    585585    AssertPtrReturnVoid(pCombo);
    … …  
    595595
    596596/*********************************************************************************************************************************
    597 *   Class UIWizardExportAppPageBasic2 implementation.                                                                            *
     597*   Class UIWizardExportAppPageFormat implementation.                                                                            *
    598598*********************************************************************************************************************************/
    599599
    600 UIWizardExportAppPageBasic2::UIWizardExportAppPageBasic2(bool fExportToOCIByDefault)
     600UIWizardExportAppPageFormat::UIWizardExportAppPageFormat(bool fExportToOCIByDefault)
    601601    : m_fExportToOCIByDefault(fExportToOCIByDefault)
    602602    , m_pLabelFormat(0)
    … …  
    849849    /* Setup connections: */
    850850    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileRegistered,
    851             this, &UIWizardExportAppPageBasic2::sltHandleFormatComboChange);
     851            this, &UIWizardExportAppPageFormat::sltHandleFormatComboChange);
    852852    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
    853             this, &UIWizardExportAppPageBasic2::sltHandleFormatComboChange);
     853            this, &UIWizardExportAppPageFormat::sltHandleFormatComboChange);
    854854    connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,
    855             this, &UIWizardExportAppPageBasic2::sltHandleFileSelectorChange);
     855            this, &UIWizardExportAppPageFormat::sltHandleFileSelectorChange);
    856856    connect(m_pFormatComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
    857             this, &UIWizardExportAppPageBasic2::sltHandleFormatComboChange);
     857            this, &UIWizardExportAppPageFormat::sltHandleFormatComboChange);
    858858    connect(m_pMACComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
    859             this, &UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange);
     859            this, &UIWizardExportAppPageFormat::sltHandleMACAddressExportPolicyComboChange);
    860860    connect(m_pManifestCheckbox, &QCheckBox::stateChanged,
    861             this, &UIWizardExportAppPageBasic2::sltHandleManifestCheckBoxChange);
     861            this, &UIWizardExportAppPageFormat::sltHandleManifestCheckBoxChange);
    862862    connect(m_pIncludeISOsCheckbox, &QCheckBox::stateChanged,
    863             this, &UIWizardExportAppPageBasic2::sltHandleIncludeISOsCheckBoxChange);
     863            this, &UIWizardExportAppPageFormat::sltHandleIncludeISOsCheckBoxChange);
    864864    connect(m_pProfileComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
    865             this, &UIWizardExportAppPageBasic2::sltHandleProfileComboChange);
     865            this, &UIWizardExportAppPageFormat::sltHandleProfileComboChange);
    866866    connect(m_pExportModeButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton*, bool)>(&QButtonGroup::buttonToggled),
    867             this, &UIWizardExportAppPageBasic2::sltHandleRadioButtonToggled);
     867            this, &UIWizardExportAppPageFormat::sltHandleRadioButtonToggled);
    868868    connect(m_pProfileToolButton, &QIToolButton::clicked,
    869             this, &UIWizardExportAppPageBasic2::sltHandleProfileButtonClick);
    870 }
    871 
    872 UIWizardExportApp *UIWizardExportAppPageBasic2::wizard() const
     869            this, &UIWizardExportAppPageFormat::sltHandleProfileButtonClick);
     870}
     871
     872UIWizardExportApp *UIWizardExportAppPageFormat::wizard() const
    873873{
    874874    return qobject_cast<UIWizardExportApp*>(UINativeWizardPage::wizard());
    875875}
    876876
    877 void UIWizardExportAppPageBasic2::retranslateUi()
     877void UIWizardExportAppPageFormat::retranslateUi()
    878878{
    879879    /* Translate page: */
    880     setTitle(UIWizardExportApp::tr("Appliance settings"));
     880    setTitle(UIWizardExportApp::tr("Format settings"));
    881881
    882882    /* Translate objects: */
    … …  
    10001000}
    10011001
    1002 void UIWizardExportAppPageBasic2::initializePage()
     1002void UIWizardExportAppPageFormat::initializePage()
    10031003{
    10041004    /* Populate formats: */
    … …  
    10191019}
    10201020
    1021 bool UIWizardExportAppPageBasic2::isComplete() const
     1021bool UIWizardExportAppPageFormat::isComplete() const
    10221022{
    10231023    /* Initial result: */
    … …  
    10341034}
    10351035
    1036 bool UIWizardExportAppPageBasic2::validatePage()
     1036bool UIWizardExportAppPageFormat::validatePage()
    10371037{
    10381038    /* Initial result: */
    … …  
    10621062}
    10631063
    1064 void UIWizardExportAppPageBasic2::sltHandleFormatComboChange()
     1064void UIWizardExportAppPageFormat::sltHandleFormatComboChange()
    10651065{
    10661066    /* Update combo tool-tip: */
    … …  
    10891089}
    10901090
    1091 void UIWizardExportAppPageBasic2::sltHandleFileSelectorChange()
     1091void UIWizardExportAppPageFormat::sltHandleFileSelectorChange()
    10921092{
    10931093    /* Skip empty paths: */
    … …  
    11001100}
    11011101
    1102 void UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange()
     1102void UIWizardExportAppPageFormat::sltHandleMACAddressExportPolicyComboChange()
    11031103{
    11041104    updateMACAddressExportPolicyComboToolTip(m_pMACComboBox);
    … …  
    11071107}
    11081108
    1109 void UIWizardExportAppPageBasic2::sltHandleManifestCheckBoxChange()
     1109void UIWizardExportAppPageFormat::sltHandleManifestCheckBoxChange()
    11101110{
    11111111    wizard()->setManifestSelected(m_pManifestCheckbox->isChecked());
    … …  
    11131113}
    11141114
    1115 void UIWizardExportAppPageBasic2::sltHandleIncludeISOsCheckBoxChange()
     1115void UIWizardExportAppPageFormat::sltHandleIncludeISOsCheckBoxChange()
    11161116{
    11171117    wizard()->setIncludeISOsSelected(m_pIncludeISOsCheckbox->isChecked());
    … …  
    11191119}
    11201120
    1121 void UIWizardExportAppPageBasic2::sltHandleProfileComboChange()
     1121void UIWizardExportAppPageFormat::sltHandleProfileComboChange()
    11221122{
    11231123    /* Update wizard fields: */
    … …  
    11341134}
    11351135
    1136 void UIWizardExportAppPageBasic2::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
     1136void UIWizardExportAppPageFormat::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
    11371137{
    11381138    /* Handle checked buttons only: */
    … …  
    11451145}
    11461146
    1147 void UIWizardExportAppPageBasic2::sltHandleProfileButtonClick()
     1147void UIWizardExportAppPageFormat::sltHandleProfileButtonClick()
    11481148{
    11491149    /* Open Cloud Profile Manager: */
    … …  
    11521152}
    11531153
    1154 void UIWizardExportAppPageBasic2::updateLocalStuff()
     1154void UIWizardExportAppPageFormat::updateLocalStuff()
    11551155{
    11561156    /* Create appliance: */
    … …  
    11601160}
    11611161
    1162 void UIWizardExportAppPageBasic2::updateCloudStuff()
     1162void UIWizardExportAppPageFormat::updateCloudStuff()
    11631163{
    11641164    /* Create appliance, client, VSD and VSD export form: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageFormat.h

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic2 class declaration.
     3 * VBox Qt GUI - UIWizardExportAppPageFormat class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic2_h
    19 #define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic2_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageFormat_h
     19#define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageFormat_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    6060};
    6161
    62 /** Namespace for 2nd basic page of the Export Appliance wizard. */
    63 namespace UIWizardExportAppPage2
     62/** Namespace for Format page of the Export Appliance wizard. */
     63namespace UIWizardExportAppFormat
    6464{
    6565    /** Populates formats. */
    … …  
    135135}
    136136
    137 /** UINativeWizardPage extension for 2nd basic page of the Export Appliance wizard,
    138   * based on UIWizardExportAppPage2 namespace functions. */
    139 class UIWizardExportAppPageBasic2 : public UINativeWizardPage
     137/** UINativeWizardPage extension for Format page of the Export Appliance wizard,
     138  * based on UIWizardExportAppFormat namespace functions. */
     139class UIWizardExportAppPageFormat : public UINativeWizardPage
    140140{
    141141    Q_OBJECT;
    … …  
    143143public:
    144144
    145     /** Constructs 2nd basic page. */
    146     UIWizardExportAppPageBasic2(bool fExportToOCIByDefault);
     145    /** Constructs Format page. */
     146    UIWizardExportAppPageFormat(bool fExportToOCIByDefault);
    147147
    148148protected:
    … …  
    260260};
    261261
    262 #endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic2_h */
     262#endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageFormat_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageSettings.cpp

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic3 class implementation.
     3 * VBox Qt GUI - UIWizardExportAppPageSettings class implementation.
    44 */
    55
    … …  
    2828#include "UIMessageCenter.h"
    2929#include "UIWizardExportApp.h"
    30 #include "UIWizardExportAppPageBasic3.h"
     30#include "UIWizardExportAppPageSettings.h"
    3131
    3232/* COM includes: */
    … …  
    3535
    3636/* Namespaces: */
    37 using namespace UIWizardExportAppPage3;
     37using namespace UIWizardExportAppSettings;
    3838
    3939
    4040/*********************************************************************************************************************************
    41 *   Class UIWizardExportAppPage3 implementation.                                                                                 *
     41*   Class UIWizardExportAppSettings implementation.                                                                              *
    4242*********************************************************************************************************************************/
    4343
    44 void UIWizardExportAppPage3::refreshStackedWidget(QStackedWidget *pStackedWidget,
    45                                                   bool fIsFormatCloudOne)
     44void UIWizardExportAppSettings::refreshStackedWidget(QStackedWidget *pStackedWidget,
     45                                                     bool fIsFormatCloudOne)
    4646{
    4747    /* Update stack appearance according to chosen format: */
    … …  
    4949}
    5050
    51 void UIWizardExportAppPage3::refreshApplianceSettingsWidget(UIApplianceExportEditorWidget *pApplianceWidget,
    52                                                             const CAppliance &comAppliance,
    53                                                             bool fIsFormatCloudOne)
     51void UIWizardExportAppSettings::refreshApplianceSettingsWidget(UIApplianceExportEditorWidget *pApplianceWidget,
     52                                                               const CAppliance &comAppliance,
     53                                                               bool fIsFormatCloudOne)
    5454{
    5555    /* Nothing for cloud case? */
    … …  
    6464}
    6565
    66 void UIWizardExportAppPage3::refreshFormPropertiesTable(UIFormEditorWidget *pFormEditor,
    67                                                         const CVirtualSystemDescriptionForm &comVsdForm,
    68                                                         bool fIsFormatCloudOne)
     66void UIWizardExportAppSettings::refreshFormPropertiesTable(UIFormEditorWidget *pFormEditor,
     67                                                           const CVirtualSystemDescriptionForm &comVsdForm,
     68                                                           bool fIsFormatCloudOne)
    6969{
    7070    /* Nothing for local case? */
    … …  
    8181
    8282/*********************************************************************************************************************************
    83 *   Class UIWizardExportAppPageBasic3 implementation.                                                                            *
     83*   Class UIWizardExportAppPageSettings implementation.                                                                          *
    8484*********************************************************************************************************************************/
    8585
    86 UIWizardExportAppPageBasic3::UIWizardExportAppPageBasic3()
     86UIWizardExportAppPageSettings::UIWizardExportAppPageSettings()
    8787    : m_pLabel(0)
    8888    , m_pSettingsWidget2(0)
    … …  
    153153}
    154154
    155 UIWizardExportApp *UIWizardExportAppPageBasic3::wizard() const
     155UIWizardExportApp *UIWizardExportAppPageSettings::wizard() const
    156156{
    157157    return qobject_cast<UIWizardExportApp*>(UINativeWizardPage::wizard());
    158158}
    159159
    160 void UIWizardExportAppPageBasic3::retranslateUi()
     160void UIWizardExportAppPageSettings::retranslateUi()
    161161{
    162162    /* Translate page: */
    163     setTitle(UIWizardExportApp::tr("Virtual system settings"));
     163    setTitle(UIWizardExportApp::tr("Appliance settings"));
    164164
    165165    /* Translate label: */
    … …  
    173173}
    174174
    175 void UIWizardExportAppPageBasic3::initializePage()
     175void UIWizardExportAppPageSettings::initializePage()
    176176{
    177177    /* Translate page: */
    … …  
    191191}
    192192
    193 bool UIWizardExportAppPageBasic3::validatePage()
     193bool UIWizardExportAppPageSettings::validatePage()
    194194{
    195195    /* Initial result: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageSettings.h

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic3 class declaration.
     3 * VBox Qt GUI - UIWizardExportAppPageSettings class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic3_h
    19 #define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic3_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageSettings_h
     19#define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageSettings_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3939class UIWizardExportApp;
    4040
    41 /** Namespace for 3rd basic page of the Export Appliance wizard. */
    42 namespace UIWizardExportAppPage3
     41/** Namespace for Settings page of the Export Appliance wizard. */
     42namespace UIWizardExportAppSettings
    4343{
    4444    /** Refresh stacked widget. */
    … …  
    5656}
    5757
    58 /** UINativeWizardPage extension for 3rd basic page of the Export Appliance wizard,
    59   * based on UIWizardExportAppPage3 namespace functions. */
    60 class UIWizardExportAppPageBasic3 : public UINativeWizardPage
     58/** UINativeWizardPage extension for Settings page of the Export Appliance wizard,
     59  * based on UIWizardExportAppSettings namespace functions. */
     60class UIWizardExportAppPageSettings : public UINativeWizardPage
    6161{
    6262    Q_OBJECT;
    … …  
    6464public:
    6565
    66     /** Constructs 3rd basic page. */
    67     UIWizardExportAppPageBasic3();
     66    /** Constructs Settings page. */
     67    UIWizardExportAppPageSettings();
    6868
    6969protected:
    … …  
    9898};
    9999
    100 #endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic3_h */
     100#endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageSettings_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageVMs.cpp

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic1 class implementation.
     3 * VBox Qt GUI - UIWizardExportAppPageVMs class implementation.
    44 */
    55
    … …  
    2626#include "UIMessageCenter.h"
    2727#include "UIWizardExportApp.h"
    28 #include "UIWizardExportAppPageBasic1.h"
     28#include "UIWizardExportAppPageVMs.h"
    2929
    3030/* COM includes: */
    … …  
    3232
    3333/* Namespaces: */
    34 using namespace UIWizardExportAppPage1;
     34using namespace UIWizardExportAppVMs;
    3535
    3636
    … …  
    7070
    7171/*********************************************************************************************************************************
    72 *   Class UIWizardExportAppPage1 implementation.                                                                                 *
     72*   Class UIWizardExportAppVMs implementation.                                                                                   *
    7373*********************************************************************************************************************************/
    7474
    75 void UIWizardExportAppPage1::populateVMItems(QListWidget *pVMSelector, const QStringList &selectedVMNames)
     75void UIWizardExportAppVMs::populateVMItems(QListWidget *pVMSelector, const QStringList &selectedVMNames)
    7676{
    7777    /* Add all VM items into VM selector: */
    … …  
    121121}
    122122
    123 void UIWizardExportAppPage1::refreshSavedMachines(QStringList &savedMachines, QListWidget *pVMSelector)
     123void UIWizardExportAppVMs::refreshSavedMachines(QStringList &savedMachines, QListWidget *pVMSelector)
    124124{
    125125    savedMachines.clear();
    … …  
    129129}
    130130
    131 QStringList UIWizardExportAppPage1::machineNames(QListWidget *pVMSelector)
     131QStringList UIWizardExportAppVMs::machineNames(QListWidget *pVMSelector)
    132132{
    133133    /* Prepare list: */
    … …  
    140140}
    141141
    142 QList<QUuid> UIWizardExportAppPage1::machineIDs(QListWidget *pVMSelector)
     142QList<QUuid> UIWizardExportAppVMs::machineIDs(QListWidget *pVMSelector)
    143143{
    144144    /* Prepare list: */
    … …  
    153153
    154154/*********************************************************************************************************************************
    155 *   Class UIWizardExportAppPageBasic1 implementation.                                                                            *
     155*   Class UIWizardExportAppPageVMs implementation.                                                                               *
    156156*********************************************************************************************************************************/
    157157
    158 UIWizardExportAppPageBasic1::UIWizardExportAppPageBasic1(const QStringList &selectedVMNames, bool fFastTravelToNextPage)
     158UIWizardExportAppPageVMs::UIWizardExportAppPageVMs(const QStringList &selectedVMNames, bool fFastTravelToNextPage)
    159159    : m_selectedVMNames(selectedVMNames)
    160160    , m_fFastTravelToNextPage(fFastTravelToNextPage)
    … …  
    183183    /* Setup connections: */
    184184    connect(m_pVMSelector, &QListWidget::itemSelectionChanged,
    185             this, &UIWizardExportAppPageBasic1::sltHandleVMItemSelectionChanged);
    186 }
    187 
    188 UIWizardExportApp *UIWizardExportAppPageBasic1::wizard() const
     185            this, &UIWizardExportAppPageVMs::sltHandleVMItemSelectionChanged);
     186}
     187
     188UIWizardExportApp *UIWizardExportAppPageVMs::wizard() const
    189189{
    190190    return qobject_cast<UIWizardExportApp*>(UINativeWizardPage::wizard());
    191191}
    192192
    193 void UIWizardExportAppPageBasic1::retranslateUi()
     193void UIWizardExportAppPageVMs::retranslateUi()
    194194{
    195195    /* Translate page: */
    196     setTitle(UIWizardExportApp::tr("Virtual machines to export"));
     196    setTitle(UIWizardExportApp::tr("Virtual machines"));
    197197
    198198    /* Translate widgets: */
    … …  
    202202}
    203203
    204 void UIWizardExportAppPageBasic1::initializePage()
     204void UIWizardExportAppPageVMs::initializePage()
    205205{
    206206    /* Populate VM items: */
    … …  
    215215}
    216216
    217 bool UIWizardExportAppPageBasic1::isComplete() const
     217bool UIWizardExportAppPageVMs::isComplete() const
    218218{
    219219    /* Initial result: */
    … …  
    227227}
    228228
    229 bool UIWizardExportAppPageBasic1::validatePage()
     229bool UIWizardExportAppPageVMs::validatePage()
    230230{
    231231    /* Initial result: */
    … …  
    242242}
    243243
    244 void UIWizardExportAppPageBasic1::sltHandleVMItemSelectionChanged()
     244void UIWizardExportAppPageVMs::sltHandleVMItemSelectionChanged()
    245245{
    246246    /* Update wizard fields: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageVMs.h

    r91706 r91707  
    11/* $Id$ */
    22/** @file
    3  * VBox Qt GUI - UIWizardExportAppPageBasic1 class declaration.
     3 * VBox Qt GUI - UIWizardExportAppPageVMs class declaration.
    44 */
    55
    … …  
    1616 */
    1717
    18 #ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic1_h
    19 #define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic1_h
     18#ifndef FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageVMs_h
     19#define FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageVMs_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    … …  
    3333class UIWizardExportApp;
    3434
    35 /** Namespace for 1st basic page of the Export Appliance wizard. */
    36 namespace UIWizardExportAppPage1
     35/** Namespace for VMs page of the Export Appliance wizard. */
     36namespace UIWizardExportAppVMs
    3737{
    3838    /** Populates @a pVMSelector with items on the basis of passed @a selectedVMNames. */
    … …  
    4848}
    4949
    50 /** UINativeWizardPage extension for 1st basic page of the Export Appliance wizard,
    51   * based on UIWizardExportAppPage1 namespace functions. */
    52 class UIWizardExportAppPageBasic1 : public UINativeWizardPage
     50/** UINativeWizardPage extension for VMs page of the Export Appliance wizard,
     51  * based on UIWizardExportAppVMs namespace functions. */
     52class UIWizardExportAppPageVMs : public UINativeWizardPage
    5353{
    5454    Q_OBJECT;
    … …  
    5656public:
    5757
    58     /** Constructs 1st basic page.
     58    /** Constructs VMs page.
    5959      * @param  selectedVMNames        Brings the list of selected VM names.
    6060      * @param  fFastTravelToNextPage  Brings whether we should fast-travel to next page. */
    61     UIWizardExportAppPageBasic1(const QStringList &selectedVMNames, bool fFastTravelToNextPage);
     61    UIWizardExportAppPageVMs(const QStringList &selectedVMNames, bool fFastTravelToNextPage);
    6262
    6363protected:
    … …  
    9797};
    9898
    99 #endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageBasic1_h */
     99#endif /* !FEQT_INCLUDED_SRC_wizards_exportappliance_UIWizardExportAppPageVMs_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