Changeset 73030 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 10, 2018 10:23:23 AM (7 years ago)

Author:

vboxsync

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

123582

Message:

FE/Qt: bugref:9152: Export Appliance wizard: Storage and Expert pages: Refresh only required settings on corresponding triggers, not just everything.

Location:

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

Files:

• UIWizardExportAppPageBasic3.cpp (modified) (6 diffs)
• UIWizardExportAppPageBasic3.h (modified) (2 diffs)
• UIWizardExportAppPageExpert.cpp (modified) (5 diffs)

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

@@ -107 +107 @@
 }
 
-void UIWizardExportAppPage3::refreshCurrentSettings()
-{
-    /* Compose file-name: */
-    QString strName;
-
+void UIWizardExportAppPage3::refreshFileSelectorName()
+{
     /* 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];
+        m_strFileSelectorName = fieldImp("machineNames").toStringList()[0];
     /* Otherwise => we use the default file-name: */
     else
-        strName = m_strDefaultApplianceName;
-
+        m_strFileSelectorName = m_strDefaultApplianceName;
+
+    /* Cascade update for file selector path: */
+    refreshFileSelectorPath();
+}
+
+void UIWizardExportAppPage3::refreshFileSelectorExtension()
+{
     /* If the format is set to OPC: */
     if (fieldImp("format").toString() == "opc-1.0")
     {
         /* We use .tar.gz extension: */
-        strName += ".tar.gz";
+        m_strFileSelectorExt = ".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: */
@@ -136 +135 @@
     {
         /* We use the default (.ova) extension: */
-        strName += ".ova";
+        m_strFileSelectorExt = ".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: */
+    }
+
+    /* Cascade update for file selector path: */
+    refreshFileSelectorPath();
+}
+
+void UIWizardExportAppPage3::refreshFileSelectorPath()
+{
+    /* Compose file selector path: */
+    const QString strPath = QDir::toNativeSeparators(QString("%1/%2")
+                                                     .arg(vboxGlobal().documentsPath())
+                                                     .arg(m_strFileSelectorName + m_strFileSelectorExt));
+
+    /* Assign the path: */
+    m_pFileSelector->setPath(strPath);
+}
+
+void UIWizardExportAppPage3::refreshManifestCheckBoxAccess()
+{
+    /* If the format is set to OPC: */
+    if (fieldImp("format").toString() == "opc-1.0")
+    {
+        /* Disable manifest check-box: */
+        m_pManifestCheckbox->setChecked(false);
+        m_pManifestCheckbox->setEnabled(false);
+    }
+    /* Otherwise: */
+    else
+    {
+        /* Enable manifest check-box: */
         m_pManifestCheckbox->setEnabled(true);
     }
-
-    /* Copose file-path for 'LocalFilesystem' storage case: */
-    const StorageType enmStorageType = fieldImp("storageType").value<StorageType>();
-    if (enmStorageType == LocalFilesystem)
-        strName = QDir::toNativeSeparators(QString("%1/%2").arg(vboxGlobal().documentsPath()).arg(strName));
-
-    /* Assign file-path: */
-    m_pFileSelector->setPath(strName);
 }
 
@@ -437 +456 @@
     }
 
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh file selector name: */
+    refreshFileSelectorName();
 
     /* Update page appearance: */
@@ -452 +471 @@
     /* Translate page: */
     retranslateUi();
+
+    /* Refresh file selector name: */
+    // refreshFileSelectorName(); alreeady called from retranslateUi();
+    /* Refresh file selector extension: */
+    refreshFileSelectorExtension();
+    /* Refresh manifest check-box access: */
+    refreshManifestCheckBoxAccess();
 }
 
@@ -526 +552 @@
     updateFormatComboToolTip();
 
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh required settings: */
+    refreshFileSelectorExtension();
+    refreshManifestCheckBoxAccess();
 }
 
@@ -534 +561 @@
     /* Update tool-tip: */
     updateProviderComboToolTip();
-
-    /* Refresh current settings: */
-    refreshCurrentSettings();
-}
+}

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

@@ -51 +51 @@
     virtual void updatePageAppearance();
 
-    /** Refreshes current settings. */
-    void refreshCurrentSettings();
+    /** Refresh file selector name. */
+    void refreshFileSelectorName();
+    /** Refresh file selector extension. */
+    void refreshFileSelectorExtension();
+    /** Refresh file selector path. */
+    void refreshFileSelectorPath();
+    /** Refresh Manifest check-box access. */
+    void refreshManifestCheckBoxAccess();
 
     /** Updates format combo tool-tips. */
@@ -81 +87 @@
     /** Holds the default appliance name. */
     QString  m_strDefaultApplianceName;
+
+    /** Holds the file selector name. */
+    QString  m_strFileSelectorName;
+    /** Holds the file selector ext. */
+    QString  m_strFileSelectorExt;
 
     /** Holds the settings widget instance. */

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

@@ -376 +376 @@
     }
 
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh file selector name: */
+    refreshFileSelectorName();
 
     /* Update tool-tips: */
@@ -389 +389 @@
     retranslateUi();
 
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh file selector name: */
+    // refreshFileSelectorName(); already called from retranslateUi();
+    /* Refresh file selector extension: */
+    refreshFileSelectorExtension();
+    /* Refresh manifest check-box access: */
+    refreshManifestCheckBoxAccess();
+
     /* Refresh appliance settings: */
     refreshApplianceSettingsWidget();
@@ -453 +458 @@
 void UIWizardExportAppPageExpert::sltVMSelectionChangeHandler()
 {
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh required settings: */
+    refreshFileSelectorName();
     refreshApplianceSettingsWidget();
 
@@ -475 +480 @@
     updateFormatComboToolTip();
 
-    /* Refresh current settings: */
-    refreshCurrentSettings();
+    /* Refresh required settings: */
+    refreshFileSelectorExtension();
+    refreshManifestCheckBoxAccess();
 }
 
@@ -483 +489 @@
     /* Update tool-tip: */
     updateProviderComboToolTip();
-
-    /* Refresh current settings: */
-    refreshCurrentSettings();
-}
+}