Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp (revision 68068) @@ -33,3 +33,4 @@ QStringList UIDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack"; QStringList UIDefs::OVFFileExts = QStringList() << "ovf" << "ova"; +QStringList UIDefs::OPCFileExts = QStringList() << "tar.gz"; Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h (revision 68068) @@ -87,4 +87,5 @@ extern QStringList VBoxExtPackFileExts; extern QStringList OVFFileExts; + extern QStringList OPCFileExts; } using namespace UIDefs /* if header included */; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (revision 68068) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2009-2016 Oracle Corporation + * Copyright (C) 2009-2017 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -100,12 +100,46 @@ } - /* Use the default filename: */ - QString strName = m_strDefaultApplianceName; - /* If it is one VM only, we use the VM name as filename: */ + /* Compose file-name: */ + QString strName; + + /* If it's one VM only, we use the VM name as file-name: */ if (fieldImp("machineNames").toStringList().size() == 1) strName = fieldImp("machineNames").toStringList()[0]; - strName += ".ova"; + /* Otherwise => we use the default file-name: */ + else + strName = m_strDefaultApplianceName; + + /* If the format is set to OPC: */ + if (fieldImp("format").toString() == "opc-1.0") + { + /* We use .tar.gz extension: */ + strName += ".tar.gz"; + + /* Update file chooser accordingly: */ + m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Oracle Public Cloud Format Archive (%1)").arg("*.tar.gz")); + + /* Disable manifest file creation: */ + m_pManifestCheckbox->setChecked(false); + m_pManifestCheckbox->setEnabled(false); + } + /* Otherwise: */ + else + { + /* We use the default (.ova) extension: */ + strName += ".ova"; + + /* Update file chooser accordingly: */ + m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Open Virtualization Format Archive (%1)").arg("*.ova") + ";;" + + UIWizardExportApp::tr("Open Virtualization Format (%1)").arg("*.ovf")); + + /* Enable manifest file creation: */ + m_pManifestCheckbox->setEnabled(true); + } + + /* Copose file-path for 'Filesystem' storage case: */ if (storageType == Filesystem) strName = QDir::toNativeSeparators(QString("%1/%2").arg(vboxGlobal().documentsPath()).arg(strName)); + + /* Assign file-path: */ m_pFileSelector->setPath(strName); } @@ -240,11 +274,14 @@ m_pFormatComboBox = new QComboBox(this); { - const QString strFormat09("ovf-0.9"); - const QString strFormat10("ovf-1.0"); - const QString strFormat20("ovf-2.0"); - m_pFormatComboBox->addItem(strFormat09, strFormat09); - m_pFormatComboBox->addItem(strFormat10, strFormat10); - m_pFormatComboBox->addItem(strFormat20, strFormat20); - connect(m_pFormatComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(sltUpdateFormatComboToolTip())); + const QString strFormatOVF09("ovf-0.9"); + const QString strFormatOVF10("ovf-1.0"); + const QString strFormatOVF20("ovf-2.0"); + const QString strFormatOPC10("opc-1.0"); + m_pFormatComboBox->addItem(strFormatOVF09, strFormatOVF09); + m_pFormatComboBox->addItem(strFormatOVF10, strFormatOVF10); + m_pFormatComboBox->addItem(strFormatOVF20, strFormatOVF20); + m_pFormatComboBox->addItem(strFormatOPC10, strFormatOPC10); + connect(m_pFormatComboBox, static_cast(&QComboBox::currentIndexChanged), + this, &UIWizardExportAppPageBasic3::sltHandleFormatComboChange); } m_pFormatComboBoxLabel = new QLabel(this); @@ -291,4 +328,10 @@ } +void UIWizardExportAppPageBasic3::sltHandleFormatComboChange() +{ + refreshCurrentSettings(); + updateFormatComboToolTip(); +} + void UIWizardExportAppPageBasic3::retranslateUi() { @@ -306,14 +349,14 @@ m_pFileSelector->setChooseButtonToolTip(tr("Choose a file to export the virtual appliance to...")); m_pFileSelector->setFileDialogTitle(UIWizardExportApp::tr("Please choose a file to export the virtual appliance to")); - m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Open Virtualization Format Archive (%1)").arg("*.ova") + ";;" + - UIWizardExportApp::tr("Open Virtualization Format (%1)").arg("*.ovf")); m_pFormatComboBoxLabel->setText(UIWizardExportApp::tr("F&ormat:")); - m_pFormatComboBox->setItemText(0, UIWizardExportApp::tr("OVF 0.9")); - m_pFormatComboBox->setItemText(1, UIWizardExportApp::tr("OVF 1.0")); - m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("OVF 2.0")); + m_pFormatComboBox->setItemText(0, UIWizardExportApp::tr("Open Virtualization Format 0.9")); + m_pFormatComboBox->setItemText(1, UIWizardExportApp::tr("Open Virtualization Format 1.0")); + m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("Open Virtualization Format 2.0")); + m_pFormatComboBox->setItemText(3, UIWizardExportApp::tr("Oracle Public Cloud Format 1.0")); m_pFormatComboBox->setItemData(0, UIWizardExportApp::tr("Write in legacy OVF 0.9 format for compatibility " "with other virtualization products."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(1, UIWizardExportApp::tr("Write in standard OVF 1.0 format."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(2, UIWizardExportApp::tr("Write in new experimental OVF 2.0 format."), Qt::ToolTipRole); + m_pFormatComboBox->setItemData(3, UIWizardExportApp::tr("Write in Oracle Public Cloud 1.0 format."), Qt::ToolTipRole); m_pManifestCheckbox->setToolTip(UIWizardExportApp::tr("Create a Manifest file for automatic data integrity checks on import.")); m_pManifestCheckbox->setText(UIWizardExportApp::tr("Write &Manifest file")); @@ -339,5 +382,12 @@ { const QString &strFile = m_pFileSelector->path().toLower(); - fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts); + bool fOVF = field("format").toString() == "ovf-0.9" + || field("format").toString() == "ovf-1.0" + || field("format").toString() == "ovf-2.0"; + bool fOPC = field("format").toString() == "opc-1.0"; + fResult = ( fOVF + && VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts)) + || ( fOPC + && VBoxGlobal::hasAllowedExtension(strFile, OPCFileExts)); if (fResult) { @@ -377,10 +427,13 @@ case Filesystem: { - m_pLabel->setText(tr("

Please choose a filename to export the OVF/OVA to.

" - "

If you use an ova extension, " - "then all the files will be combined into one Open Virtualization Format Archive.

" - "

If you use an ovf extension, " - "several files will be written separately.

" - "

Other extensions are not allowed.

")); + m_pLabel->setText(tr("

Please choose a filename to export the virtual appliance to.

" + "

Open Virtualization Format supports only " + "ovf or ova extensions. " + "
If you use an ovf extension, " + "several files will be written separately." + "
If you use an ova extension, " + "all the files will be combined into one Open Virtualization Format archive.

" + "

Oracle Public Cloud Format supports only tar.gz extension." + "
Each virtual disk file will be written separately.

")); m_pFileSelector->setFocus(); break; Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h (revision 68068) @@ -112,5 +112,5 @@ /* Format combo change handler: */ - void sltUpdateFormatComboToolTip() { updateFormatComboToolTip(); } + void sltHandleFormatComboChange(); private: Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp (revision 68068) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2009-2016 Oracle Corporation + * Copyright (C) 2009-2017 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -131,11 +131,14 @@ m_pFormatComboBox = new QComboBox(m_pSettingsCnt); { - const QString strFormat09("ovf-0.9"); - const QString strFormat10("ovf-1.0"); - const QString strFormat20("ovf-2.0"); - m_pFormatComboBox->addItem(strFormat09, strFormat09); - m_pFormatComboBox->addItem(strFormat10, strFormat10); - m_pFormatComboBox->addItem(strFormat20, strFormat20); - connect(m_pFormatComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(sltUpdateFormatComboToolTip())); + const QString strFormatOVF09("ovf-0.9"); + const QString strFormatOVF10("ovf-1.0"); + const QString strFormatOVF20("ovf-2.0"); + const QString strFormatOPC10("opc-1.0"); + m_pFormatComboBox->addItem(strFormatOVF09, strFormatOVF09); + m_pFormatComboBox->addItem(strFormatOVF10, strFormatOVF10); + m_pFormatComboBox->addItem(strFormatOVF20, strFormatOVF20); + m_pFormatComboBox->addItem(strFormatOPC10, strFormatOPC10); + connect(m_pFormatComboBox, static_cast(&QComboBox::currentIndexChanged), + this, &UIWizardExportAppPageExpert::sltHandleFormatComboChange); } m_pFormatComboBoxLabel = new QLabel(m_pSettingsCnt); @@ -214,4 +217,10 @@ /* Broadcast complete-change: */ emit completeChanged(); +} + +void UIWizardExportAppPageExpert::sltHandleFormatComboChange() +{ + refreshCurrentSettings(); + updateFormatComboToolTip(); } @@ -235,18 +244,19 @@ m_pFileSelector->setChooseButtonToolTip(tr("Choose a file to export the virtual appliance to...")); m_pFileSelector->setFileDialogTitle(UIWizardExportApp::tr("Please choose a file to export the virtual appliance to")); - m_pFileSelector->setFileFilters(UIWizardExportApp::tr("Open Virtualization Format Archive (%1)").arg("*.ova") + ";;" + - UIWizardExportApp::tr("Open Virtualization Format (%1)").arg("*.ovf")); m_pFormatComboBoxLabel->setText(UIWizardExportApp::tr("F&ormat:")); - m_pFormatComboBox->setItemText(0, UIWizardExportApp::tr("OVF 0.9")); - m_pFormatComboBox->setItemText(1, UIWizardExportApp::tr("OVF 1.0")); - m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("OVF 2.0")); + m_pFormatComboBox->setItemText(0, UIWizardExportApp::tr("Open Virtualization Format 0.9")); + m_pFormatComboBox->setItemText(1, UIWizardExportApp::tr("Open Virtualization Format 1.0")); + m_pFormatComboBox->setItemText(2, UIWizardExportApp::tr("Open Virtualization Format 2.0")); + m_pFormatComboBox->setItemText(3, UIWizardExportApp::tr("Oracle Public Cloud Format 1.0")); m_pFormatComboBox->setItemData(0, UIWizardExportApp::tr("Write in legacy OVF 0.9 format for compatibility " "with other virtualization products."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(1, UIWizardExportApp::tr("Write in standard OVF 1.0 format."), Qt::ToolTipRole); m_pFormatComboBox->setItemData(2, UIWizardExportApp::tr("Write in new experimental OVF 2.0 format."), Qt::ToolTipRole); + m_pFormatComboBox->setItemData(3, UIWizardExportApp::tr("Write in Oracle Public Cloud 1.0 format."), Qt::ToolTipRole); m_pManifestCheckbox->setToolTip(UIWizardExportApp::tr("Create a Manifest file for automatic data integrity checks on import.")); m_pManifestCheckbox->setText(UIWizardExportApp::tr("Write &Manifest file")); /* Refresh current settings: */ + refreshCurrentSettings(); updateFormatComboToolTip(); } @@ -275,5 +285,12 @@ { const QString &strFile = m_pFileSelector->path().toLower(); - fResult = VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts); + bool fOVF = field("format").toString() == "ovf-0.9" + || field("format").toString() == "ovf-1.0" + || field("format").toString() == "ovf-2.0"; + bool fOPC = field("format").toString() == "opc-1.0"; + fResult = ( fOVF + && VBoxGlobal::hasAllowedExtension(strFile, OVFFileExts)) + || ( fOPC + && VBoxGlobal::hasAllowedExtension(strFile, OPCFileExts)); if (fResult) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 68067) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (revision 68068) @@ -71,5 +71,5 @@ /* Format combo change handler: */ - void sltUpdateFormatComboToolTip() { updateFormatComboToolTip(); } + void sltHandleFormatComboChange(); private: