Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 82385) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 82386) @@ -305,8 +305,8 @@ /* Prepare export options: */ QVector options; - switch (field("macAddressPolicy").value()) - { - case MACAddressPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break; - case MACAddressPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break; + switch (field("macAddressExportPolicy").value()) + { + case MACAddressExportPolicy_StripAllNonNATMACs: options.append(KExportOptions_StripAllNonNATMACs); break; + case MACAddressExportPolicy_StripAllMACs: options.append(KExportOptions_StripAllMACs); break; default: break; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 82385) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 82386) @@ -135,5 +135,5 @@ /* Apply hardcoded policies list: */ - for (int i = 0; i < (int)MACAddressPolicy_MAX; ++i) + for (int i = 0; i < (int)MACAddressExportPolicy_MAX; ++i) { m_pMACComboBox->addItem(QString::number(i)); @@ -142,5 +142,5 @@ /* Set default: */ - setMACAddressPolicy(MACAddressPolicy_StripAllNonNATMACs); + setMACAddressExportPolicy(MACAddressExportPolicy_StripAllNonNATMACs); } @@ -505,5 +505,5 @@ } -void UIWizardExportAppPage2::updateMACAddressPolicyComboToolTip() +void UIWizardExportAppPage2::updateMACAddressExportPolicyComboToolTip() { const int iCurrentIndex = m_pMACComboBox->currentIndex(); @@ -575,15 +575,15 @@ } -void UIWizardExportAppPage2::setMACAddressPolicy(MACAddressPolicy enmMACAddressPolicy) -{ - const int iIndex = m_pMACComboBox->findData((int)enmMACAddressPolicy); +void UIWizardExportAppPage2::setMACAddressExportPolicy(MACAddressExportPolicy enmMACAddressExportPolicy) +{ + const int iIndex = m_pMACComboBox->findData((int)enmMACAddressExportPolicy); AssertMsg(iIndex != -1, ("Data not found!")); m_pMACComboBox->setCurrentIndex(iIndex); } -MACAddressPolicy UIWizardExportAppPage2::macAddressPolicy() const +MACAddressExportPolicy UIWizardExportAppPage2::macAddressExportPolicy() const { const int iIndex = m_pMACComboBox->currentIndex(); - return (MACAddressPolicy)m_pMACComboBox->itemData(iIndex).toInt(); + return (MACAddressExportPolicy)m_pMACComboBox->itemData(iIndex).toInt(); } @@ -965,5 +965,5 @@ this, &UIWizardExportAppPageBasic2::sltHandleFormatComboChange); connect(m_pMACComboBox, static_cast(&QComboBox::currentIndexChanged), - this, &UIWizardExportAppPageBasic2::sltHandleMACAddressPolicyComboChange); + this, &UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange); connect(m_pAccountComboBox, static_cast(&QComboBox::currentIndexChanged), this, &UIWizardExportAppPageBasic2::sltHandleAccountComboChange); @@ -975,5 +975,5 @@ registerField("isFormatCloudOne", this, "isFormatCloudOne"); registerField("path", this, "path"); - registerField("macAddressPolicy", this, "macAddressPolicy"); + registerField("macAddressExportPolicy", this, "macAddressExportPolicy"); registerField("manifestSelected", this, "manifestSelected"); registerField("includeISOsSelected", this, "includeISOsSelected"); @@ -1049,15 +1049,15 @@ /* Translate MAC address policy combo-box: */ m_pMACComboBoxLabel->setText(UIWizardExportApp::tr("MAC Address &Policy:")); - m_pMACComboBox->setItemText(MACAddressPolicy_KeepAllMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_KeepAllMACs, UIWizardExportApp::tr("Include all network adapter MAC addresses")); - m_pMACComboBox->setItemText(MACAddressPolicy_StripAllNonNATMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllNonNATMACs, UIWizardExportApp::tr("Include only NAT network adapter MAC addresses")); - m_pMACComboBox->setItemText(MACAddressPolicy_StripAllMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllMACs, UIWizardExportApp::tr("Strip all network adapter MAC addresses")); - m_pMACComboBox->setItemData(MACAddressPolicy_KeepAllMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_KeepAllMACs, UIWizardExportApp::tr("Include all network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole); - m_pMACComboBox->setItemData(MACAddressPolicy_StripAllNonNATMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllNonNATMACs, UIWizardExportApp::tr("Include only NAT network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole); - m_pMACComboBox->setItemData(MACAddressPolicy_StripAllMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllMACs, UIWizardExportApp::tr("Strip all network adapter MAC addresses from exported appliance archive."), Qt::ToolTipRole); @@ -1101,5 +1101,5 @@ /* Update tool-tips: */ updateFormatComboToolTip(); - updateMACAddressPolicyComboToolTip(); + updateMACAddressExportPolicyComboToolTip(); updateAccountPropertyTableToolTips(); } @@ -1209,8 +1209,8 @@ } -void UIWizardExportAppPageBasic2::sltHandleMACAddressPolicyComboChange() +void UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange() { /* Update tool-tip: */ - updateMACAddressPolicyComboToolTip(); + updateMACAddressExportPolicyComboToolTip(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 82385) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (revision 82386) @@ -53,13 +53,13 @@ -/** MAC address policies. */ -enum MACAddressPolicy -{ - MACAddressPolicy_KeepAllMACs, - MACAddressPolicy_StripAllNonNATMACs, - MACAddressPolicy_StripAllMACs, - MACAddressPolicy_MAX -}; -Q_DECLARE_METATYPE(MACAddressPolicy); +/** MAC address export policies. */ +enum MACAddressExportPolicy +{ + MACAddressExportPolicy_KeepAllMACs, + MACAddressExportPolicy_StripAllNonNATMACs, + MACAddressExportPolicy_StripAllMACs, + MACAddressExportPolicy_MAX +}; +Q_DECLARE_METATYPE(MACAddressExportPolicy); /** Format combo data fields. */ @@ -124,6 +124,6 @@ /** Updates format combo tool-tips. */ void updateFormatComboToolTip(); - /** Updates MAC address policy combo tool-tips. */ - void updateMACAddressPolicyComboToolTip(); + /** Updates MAC address export policy combo tool-tips. */ + void updateMACAddressExportPolicyComboToolTip(); /** Updates account property table tool-tips. */ void updateAccountPropertyTableToolTips(); @@ -143,8 +143,8 @@ QString path() const; - /** Defines @a enmMACAddressPolicy. */ - void setMACAddressPolicy(MACAddressPolicy enmMACAddressPolicy); - /** Returns MAC address policy. */ - MACAddressPolicy macAddressPolicy() const; + /** Defines @a enmMACAddressExportPolicy. */ + void setMACAddressExportPolicy(MACAddressExportPolicy enmMACAddressExportPolicy); + /** Returns MAC address export policy. */ + MACAddressExportPolicy macAddressExportPolicy() const; /** Defines whether manifest @a fSelected. */ @@ -262,5 +262,5 @@ Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne); Q_PROPERTY(QString path READ path WRITE setPath); - Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy); + Q_PROPERTY(MACAddressExportPolicy macAddressExportPolicy READ macAddressExportPolicy WRITE setMACAddressExportPolicy); Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected); Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected); @@ -312,6 +312,6 @@ void sltHandleFileSelectorChange(); - /** Handles change in MAC address policy combo-box. */ - void sltHandleMACAddressPolicyComboChange(); + /** Handles change in MAC address export policy combo-box. */ + void sltHandleMACAddressExportPolicyComboChange(); /** Handles change in account combo-box. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 82385) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 82386) @@ -434,5 +434,5 @@ this, &UIWizardExportAppPageExpert::sltHandleFormatComboChange); connect(m_pMACComboBox, static_cast(&QComboBox::currentIndexChanged), - this, &UIWizardExportAppPageExpert::sltHandleMACAddressPolicyComboChange); + this, &UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange); connect(m_pAccountComboBox, static_cast(&QComboBox::currentIndexChanged), this, &UIWizardExportAppPageExpert::sltHandleAccountComboChange); @@ -449,5 +449,5 @@ registerField("isFormatCloudOne", this, "isFormatCloudOne"); registerField("path", this, "path"); - registerField("macAddressPolicy", this, "macAddressPolicy"); + registerField("macAddressExportPolicy", this, "macAddressExportPolicy"); registerField("manifestSelected", this, "manifestSelected"); registerField("includeISOsSelected", this, "includeISOsSelected"); @@ -516,15 +516,15 @@ /* Translate MAC address policy combo-box: */ m_pMACComboBoxLabel->setText(UIWizardExportApp::tr("MAC Address &Policy:")); - m_pMACComboBox->setItemText(MACAddressPolicy_KeepAllMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_KeepAllMACs, UIWizardExportApp::tr("Include all network adapter MAC addresses")); - m_pMACComboBox->setItemText(MACAddressPolicy_StripAllNonNATMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllNonNATMACs, UIWizardExportApp::tr("Include only NAT network adapter MAC addresses")); - m_pMACComboBox->setItemText(MACAddressPolicy_StripAllMACs, + m_pMACComboBox->setItemText(MACAddressExportPolicy_StripAllMACs, UIWizardExportApp::tr("Strip all network adapter MAC addresses")); - m_pMACComboBox->setItemData(MACAddressPolicy_KeepAllMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_KeepAllMACs, UIWizardExportApp::tr("Include all network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole); - m_pMACComboBox->setItemData(MACAddressPolicy_StripAllNonNATMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllNonNATMACs, UIWizardExportApp::tr("Include only NAT network adapter MAC addresses in exported appliance archive."), Qt::ToolTipRole); - m_pMACComboBox->setItemData(MACAddressPolicy_StripAllMACs, + m_pMACComboBox->setItemData(MACAddressExportPolicy_StripAllMACs, UIWizardExportApp::tr("Strip all network adapter MAC addresses from exported appliance archive."), Qt::ToolTipRole); @@ -565,5 +565,5 @@ /* Update tool-tips: */ updateFormatComboToolTip(); - updateMACAddressPolicyComboToolTip(); + updateMACAddressExportPolicyComboToolTip(); } @@ -711,8 +711,8 @@ } -void UIWizardExportAppPageExpert::sltHandleMACAddressPolicyComboChange() +void UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange() { /* Update tool-tip: */ - updateMACAddressPolicyComboToolTip(); + updateMACAddressExportPolicyComboToolTip(); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 82385) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 82386) @@ -42,5 +42,5 @@ Q_PROPERTY(bool isFormatCloudOne READ isFormatCloudOne); Q_PROPERTY(QString path READ path WRITE setPath); - Q_PROPERTY(MACAddressPolicy macAddressPolicy READ macAddressPolicy WRITE setMACAddressPolicy); + Q_PROPERTY(MACAddressExportPolicy macAddressExportPolicy READ macAddressExportPolicy WRITE setMACAddressExportPolicy); Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected); Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected); @@ -96,6 +96,6 @@ void sltHandleFileSelectorChange(); - /** Handles change in MAC address policy combo-box. */ - void sltHandleMACAddressPolicyComboChange(); + /** Handles change in MAC address export policy combo-box. */ + void sltHandleMACAddressExportPolicyComboChange(); /** Handles change in account combo-box. */