Changeset 73085 in vbox

Timestamp:

Jul 12, 2018 10:05:36 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123649

Message:

FE/Qt: bugref:9208: Export Appliance wizard: Include ISO files check-box.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportAppPageBasic3.cpp (modified) (9 diffs)
• UIWizardExportAppPageBasic3.h (modified) (4 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (6 diffs)
• UIWizardExportAppPageExpert.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -55 +55 @@
     , m_pAdditionalLabel(0)
     , m_pManifestCheckbox(0)
+    , m_pIncludeISOsCheckbox(0)
     , m_pProviderComboBoxLabel(0)
     , m_pProviderComboBox(0)
@@ -234 +235 @@
 }
 
+void UIWizardExportAppPage3::refreshIncludeISOsCheckBoxAccess()
+{
+    /* If the format is set to OPC: */
+    if (fieldImp("format").toString() == "opc-1.0")
+    {
+        /* Disable manifest check-box: */
+        m_pManifestCheckbox->setEnabled(false);
+    }
+    /* Otherwise: */
+    else
+    {
+        /* Enable manifest check-box: */
+        m_pManifestCheckbox->setEnabled(true);
+    }
+}
+
 void UIWizardExportAppPage3::updateFormatComboToolTip()
 {
@@ -298 +315 @@
 {
     m_pManifestCheckbox->setChecked(fChecked);
+}
+
+bool UIWizardExportAppPage3::isIncludeISOsSelected() const
+{
+    return m_pIncludeISOsCheckbox->isChecked();
+}
+
+void UIWizardExportAppPage3::setIncludeISOsSelected(bool fChecked)
+{
+    m_pIncludeISOsCheckbox->setChecked(fChecked);
 }
 
@@ -418 +445 @@
                         pSettingsLayout1->addWidget(m_pManifestCheckbox, 2, 1);
                     }
+                    /* Create include ISOs check-box: */
+                    m_pIncludeISOsCheckbox = new QCheckBox;
+                    if (m_pIncludeISOsCheckbox)
+                    {
+                        /* Add into layout: */
+                        pSettingsLayout1->addWidget(m_pIncludeISOsCheckbox, 3, 1);
+                    }
 
                     /* Create placeholder: */
@@ -424 +458 @@
                     {
                         /* Add into layout: */
-                        pSettingsLayout1->addWidget(pPlaceholder, 3, 0, 1, 2);
+                        pSettingsLayout1->addWidget(pPlaceholder, 4, 0, 1, 2);
                     }
                 }
@@ -531 +565 @@
     registerField("format", this, "format");
     registerField("manifestSelected", this, "manifestSelected");
+    registerField("includeISOsSelected", this, "includeISOsSelected");
 }
 
@@ -582 +617 @@
     m_pManifestCheckbox->setToolTip(UIWizardExportApp::tr("Create a Manifest file for automatic data integrity checks on import."));
     m_pManifestCheckbox->setText(UIWizardExportApp::tr("Write &Manifest file"));
+    m_pIncludeISOsCheckbox->setToolTip(UIWizardExportApp::tr("Include ISO image files into exported VM archive."));
+    m_pIncludeISOsCheckbox->setText(UIWizardExportApp::tr("Include &ISO image files"));
 
     /* Translate Provider combo-box: */
@@ -623 +660 @@
     /* Refresh manifest check-box access: */
     refreshManifestCheckBoxAccess();
+    /* Refresh include ISOs check-box access: */
+    refreshIncludeISOsCheckBoxAccess();
 }
 
@@ -701 +740 @@
     refreshFileSelectorExtension();
     refreshManifestCheckBoxAccess();
+    refreshIncludeISOsCheckBoxAccess();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.h

@@ -64 +64 @@
     /** Refresh Manifest check-box access. */
     void refreshManifestCheckBoxAccess();
+    /** Refresh Include ISOs check-box access. */
+    void refreshIncludeISOsCheckBoxAccess();
 
     /** Updates format combo tool-tips. */
@@ -88 +90 @@
     void setManifestSelected(bool fChecked);
 
+    /** Returns whether include ISOs selected. */
+    bool isIncludeISOsSelected() const;
+    /** Defines whether include ISOs @a fSelected. */
+    void setIncludeISOsSelected(bool fChecked);
+
     /** Returns provider. */
     QString provider() const;
@@ -123 +130 @@
     /** Holds the manifest check-box instance. */
     QCheckBox *m_pManifestCheckbox;
+    /** Holds the include ISOs check-box instance. */
+    QCheckBox *m_pIncludeISOsCheckbox;
 
     /** Holds the provider combo-box label instance. */
@@ -145 +154 @@
     Q_PROPERTY(QString format READ format WRITE setFormat);
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
+    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(QString provider READ provider WRITE setProvider);
 

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

@@ -221 +221 @@
                                 pSettingsLayout1->addWidget(m_pManifestCheckbox, 2, 1);
                             }
+                            /* Create include ISOs check-box: */
+                            m_pIncludeISOsCheckbox = new QCheckBox;
+                            if (m_pIncludeISOsCheckbox)
+                            {
+                                /* Add into layout: */
+                                pSettingsLayout1->addWidget(m_pIncludeISOsCheckbox, 3, 1);
+                            }
 
                             /* Create placeholder: */
@@ -227 +234 @@
                             {
                                 /* Add into layout: */
-                                pSettingsLayout1->addWidget(pPlaceholder, 3, 0, 1, 2);
+                                pSettingsLayout1->addWidget(pPlaceholder, 4, 0, 1, 2);
                             }
                         }
@@ -358 +365 @@
     registerField("format", this, "format");
     registerField("manifestSelected", this, "manifestSelected");
+    registerField("includeISOsSelected", this, "includeISOsSelected");
     registerField("applianceWidget", this, "applianceWidget");
 }
@@ -417 +425 @@
     m_pManifestCheckbox->setToolTip(UIWizardExportApp::tr("Create a Manifest file for automatic data integrity checks on import."));
     m_pManifestCheckbox->setText(UIWizardExportApp::tr("Write &Manifest file"));
+    m_pIncludeISOsCheckbox->setToolTip(UIWizardExportApp::tr("Include ISO image files into exported VM archive."));
+    m_pIncludeISOsCheckbox->setText(UIWizardExportApp::tr("Include &ISO image files"));
 
     /* Translate Provider combo-box: */
@@ -455 +465 @@
     /* Refresh manifest check-box access: */
     refreshManifestCheckBoxAccess();
+    /* Refresh include ISOs check-box access: */
+    refreshIncludeISOsCheckBoxAccess();
 
     /* Refresh appliance settings: */
@@ -543 +555 @@
     refreshFileSelectorExtension();
     refreshManifestCheckBoxAccess();
+    refreshIncludeISOsCheckBoxAccess();
 }
 

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

@@ -44 +44 @@
     Q_PROPERTY(QString format READ format WRITE setFormat);
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
+    Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);