Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp	(revision 91663)
@@ -244,12 +244,9 @@
 void UIWizardExportAppPageBasic1::sltHandleVMItemSelectionChanged()
 {
-    updateMachines();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic1::updateMachines()
-{
     /* Update wizard fields: */
     wizard()->setMachineNames(machineNames(m_pVMSelector));
     wizard()->setMachineIDs(machineIDs(m_pVMSelector));
-}
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.h	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.h	(revision 91663)
@@ -85,7 +85,4 @@
 private:
 
-    /** Updates machines. */
-    void updateMachines();
-
     /** Holds the list of selected VM names. */
     const QStringList  m_selectedVMNames;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 91663)
@@ -1064,64 +1064,4 @@
 void UIWizardExportAppPageBasic2::sltHandleFormatComboChange()
 {
-    updateFormat();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleFileSelectorChange()
-{
-    /* Skip empty paths: */
-    if (m_pFileSelector->path().isEmpty())
-        return;
-
-    m_strFileSelectorName = QFileInfo(m_pFileSelector->path()).completeBaseName();
-    wizard()->setPath(m_pFileSelector->path());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange()
-{
-    updateMACAddressExportPolicyComboToolTip(m_pMACComboBox);
-    wizard()->setMACAddressExportPolicy(m_pMACComboBox->currentData().value<MACAddressExportPolicy>());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleManifestCheckBoxChange()
-{
-    wizard()->setManifestSelected(m_pManifestCheckbox->isChecked());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleIncludeISOsCheckBoxChange()
-{
-    wizard()->setIncludeISOsSelected(m_pIncludeISOsCheckbox->isChecked());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleProfileComboChange()
-{
-    updateProfile();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
-{
-    /* Handle checked buttons only: */
-    if (!fToggled)
-        return;
-
-    /* Update cloud export mode field value: */
-    wizard()->setCloudExportMode(m_exportModeButtons.key(pButton));
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageBasic2::sltHandleProfileButtonClick()
-{
-    /* Open Cloud Profile Manager: */
-    if (gpManager)
-        gpManager->openCloudProfileManager();
-}
-
-void UIWizardExportAppPageBasic2::updateFormat()
-{
     /* Update combo tool-tip: */
     updateFormatComboToolTip(m_pFormatComboBox);
@@ -1143,16 +1083,41 @@
 
     /* Update profile: */
-    updateProfile();
-}
-
-void UIWizardExportAppPageBasic2::updateLocalStuff()
-{
-    /* Create appliance: */
-    CAppliance comAppliance;
-    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
-    wizard()->setLocalAppliance(comAppliance);
-}
-
-void UIWizardExportAppPageBasic2::updateProfile()
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleFileSelectorChange()
+{
+    /* Skip empty paths: */
+    if (m_pFileSelector->path().isEmpty())
+        return;
+
+    m_strFileSelectorName = QFileInfo(m_pFileSelector->path()).completeBaseName();
+    wizard()->setPath(m_pFileSelector->path());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleMACAddressExportPolicyComboChange()
+{
+    updateMACAddressExportPolicyComboToolTip(m_pMACComboBox);
+    wizard()->setMACAddressExportPolicy(m_pMACComboBox->currentData().value<MACAddressExportPolicy>());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleManifestCheckBoxChange()
+{
+    wizard()->setManifestSelected(m_pManifestCheckbox->isChecked());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleIncludeISOsCheckBoxChange()
+{
+    wizard()->setIncludeISOsSelected(m_pIncludeISOsCheckbox->isChecked());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleProfileComboChange()
 {
     /* Update wizard fields: */
@@ -1164,4 +1129,33 @@
                         wizard()->profileName(),
                         wizard()->isFormatCloudOne());
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
+{
+    /* Handle checked buttons only: */
+    if (!fToggled)
+        return;
+
+    /* Update cloud export mode field value: */
+    wizard()->setCloudExportMode(m_exportModeButtons.key(pButton));
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageBasic2::sltHandleProfileButtonClick()
+{
+    /* Open Cloud Profile Manager: */
+    if (gpManager)
+        gpManager->openCloudProfileManager();
+}
+
+void UIWizardExportAppPageBasic2::updateLocalStuff()
+{
+    /* Create appliance: */
+    CAppliance comAppliance;
+    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
+    wizard()->setLocalAppliance(comAppliance);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h	(revision 91663)
@@ -191,12 +191,7 @@
 private:
 
-    /** Updates format. */
-    void updateFormat();
-
     /** Update local stuff. */
     void updateLocalStuff();
 
-    /** Updates profile. */
-    void updateProfile();
     /** Updates cloud stuff. */
     void updateCloudStuff();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 91663)
@@ -673,70 +673,4 @@
 void UIWizardExportAppPageExpert::sltHandleVMItemSelectionChanged()
 {
-    updateMachines();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleFormatComboChange()
-{
-    updateFormat();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleFileSelectorChange()
-{
-    /* Skip empty paths: */
-    if (m_pFileSelector->path().isEmpty())
-        return;
-
-    m_strFileSelectorName = QFileInfo(m_pFileSelector->path()).completeBaseName();
-    wizard()->setPath(m_pFileSelector->path());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange()
-{
-    updateMACAddressExportPolicyComboToolTip(m_pMACComboBox);
-    wizard()->setMACAddressExportPolicy(m_pMACComboBox->currentData().value<MACAddressExportPolicy>());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleManifestCheckBoxChange()
-{
-    wizard()->setManifestSelected(m_pManifestCheckbox->isChecked());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleIncludeISOsCheckBoxChange()
-{
-    wizard()->setIncludeISOsSelected(m_pIncludeISOsCheckbox->isChecked());
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleProfileComboChange()
-{
-    updateProfile();
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
-{
-    /* Handle checked buttons only: */
-    if (!fToggled)
-        return;
-
-    /* Update cloud export mode field value: */
-    wizard()->setCloudExportMode(m_exportModeButtons.key(pButton));
-    emit completeChanged();
-}
-
-void UIWizardExportAppPageExpert::sltHandleProfileButtonClick()
-{
-    /* Open Cloud Profile Manager: */
-    if (gpManager)
-        gpManager->openCloudProfileManager();
-}
-
-void UIWizardExportAppPageExpert::updateMachines()
-{
     /* Update wizard fields: */
     wizard()->setMachineNames(machineNames(m_pVMSelector));
@@ -751,7 +685,10 @@
     /* Update cloud stuff: */
     updateCloudStuff();
-}
-
-void UIWizardExportAppPageExpert::updateFormat()
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleFormatComboChange()
 {
     /* Update combo tool-tip: */
@@ -777,16 +714,41 @@
     updateLocalStuff();
     /* Update profile: */
-    updateProfile();
-}
-
-void UIWizardExportAppPageExpert::updateLocalStuff()
-{
-    /* Create appliance: */
-    CAppliance comAppliance;
-    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
-    wizard()->setLocalAppliance(comAppliance);
-}
-
-void UIWizardExportAppPageExpert::updateProfile()
+    sltHandleProfileComboChange();
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleFileSelectorChange()
+{
+    /* Skip empty paths: */
+    if (m_pFileSelector->path().isEmpty())
+        return;
+
+    m_strFileSelectorName = QFileInfo(m_pFileSelector->path()).completeBaseName();
+    wizard()->setPath(m_pFileSelector->path());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleMACAddressExportPolicyComboChange()
+{
+    updateMACAddressExportPolicyComboToolTip(m_pMACComboBox);
+    wizard()->setMACAddressExportPolicy(m_pMACComboBox->currentData().value<MACAddressExportPolicy>());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleManifestCheckBoxChange()
+{
+    wizard()->setManifestSelected(m_pManifestCheckbox->isChecked());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleIncludeISOsCheckBoxChange()
+{
+    wizard()->setIncludeISOsSelected(m_pIncludeISOsCheckbox->isChecked());
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleProfileComboChange()
 {
     /* Update wizard fields: */
@@ -801,4 +763,33 @@
     /* Update cloud stuff: */
     updateCloudStuff();
+
+    /* Notify about changes: */
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleRadioButtonToggled(QAbstractButton *pButton, bool fToggled)
+{
+    /* Handle checked buttons only: */
+    if (!fToggled)
+        return;
+
+    /* Update cloud export mode field value: */
+    wizard()->setCloudExportMode(m_exportModeButtons.key(pButton));
+    emit completeChanged();
+}
+
+void UIWizardExportAppPageExpert::sltHandleProfileButtonClick()
+{
+    /* Open Cloud Profile Manager: */
+    if (gpManager)
+        gpManager->openCloudProfileManager();
+}
+
+void UIWizardExportAppPageExpert::updateLocalStuff()
+{
+    /* Create appliance: */
+    CAppliance comAppliance;
+    refreshLocalStuff(comAppliance, wizard()->machineIDs(), wizard()->uri());
+    wizard()->setLocalAppliance(comAppliance);
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h	(revision 91662)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h	(revision 91663)
@@ -110,14 +110,6 @@
 private:
 
-    /** Updates machines. */
-    void updateMachines();
-    /** Updates format. */
-    void updateFormat();
-
     /** Update local stuff. */
     void updateLocalStuff();
-
-    /** Updates profile. */
-    void updateProfile();
     /** Updates cloud stuff. */
     void updateCloudStuff();