Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp	(revision 60419)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp	(revision 60420)
@@ -37,4 +37,165 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+
+/*********************************************************************************************************************************
+*   Class UIWizardImportAppPage2 implementation.                                                                                 *
+*********************************************************************************************************************************/
+
+UIWizardImportAppPage2::UIWizardImportAppPage2()
+{
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIWizardImportAppPageBasic2 implementation.                                                                            *
+*********************************************************************************************************************************/
+
+UIWizardImportAppPageBasic2::UIWizardImportAppPageBasic2(const QString &strFileName)
+    : m_enmCertText(kCertText_Uninitialized)
+{
+    /* Create widgets: */
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    {
+        m_pLabel = new QIRichTextLabel(this);
+        m_pApplianceWidget = new UIApplianceImportEditorWidget(this);
+        {
+            m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+            m_pApplianceWidget->setFile(strFileName);
+        }
+        m_pCertLabel = new QLabel("<cert label>", this);
+        pMainLayout->addWidget(m_pLabel);
+        pMainLayout->addWidget(m_pApplianceWidget);
+        pMainLayout->addWidget(m_pCertLabel);
+    }
+
+    /* Register classes: */
+    qRegisterMetaType<ImportAppliancePointer>();
+    /* Register fields: */
+    registerField("applianceWidget", this, "applianceWidget");
+}
+
+void UIWizardImportAppPageBasic2::retranslateUi()
+{
+    /* Translate page: */
+    setTitle(UIWizardImportApp::tr("Appliance settings"));
+
+    /* Translate widgets: */
+    m_pLabel->setText(UIWizardImportApp::tr("These are the virtual machines contained in the appliance "
+                                            "and the suggested settings of the imported VirtualBox machines. "
+                                            "You can change many of the properties shown by double-clicking "
+                                            "on the items and disable others using the check boxes below."));
+    switch (m_enmCertText)
+    {
+        case kCertText_Unsigned:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance is not signed"));
+            break;
+        case kCertText_IssuedTrusted:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (trusted)").arg(m_strSignedBy));
+            break;
+        case kCertText_IssuedExpired:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (expired!)").arg(m_strSignedBy));
+            break;
+        case kCertText_IssuedUnverified:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Unverified signature by %1!").arg(m_strSignedBy));
+            break;
+        case kCertText_SelfSignedTrusted:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (trusted)").arg(m_strSignedBy));
+            break;
+        case kCertText_SelfSignedExpired:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (expired!)").arg(m_strSignedBy));
+            break;
+        case kCertText_SelfSignedUnverified:
+            m_pCertLabel->setText(UIWizardImportApp::tr("Unverified self signed signature by %1!").arg(m_strSignedBy));
+            break;
+        default:
+            AssertFailed();
+        case kCertText_Uninitialized:
+            m_pCertLabel->setText("<uninitialized page>");
+            break;
+    }
+}
+
+void UIWizardImportAppPageBasic2::initializePage()
+{
+    /* Acquire appliance and certificate: */
+    CAppliance *pAppliance = m_pApplianceWidget->appliance();
+    CCertificate certificate = pAppliance->GetCertificate();
+    if (certificate.isNull())
+        m_enmCertText = kCertText_Unsigned;
+    else
+    {
+        /* Pick a 'signed-by' name. */
+        m_strSignedBy = certificate.GetFriendlyName();
+
+        /* If trusted, just select the right message: */
+        if (certificate.GetTrusted())
+        {
+            if (certificate.GetSelfSigned())
+                m_enmCertText = !certificate.GetExpired() ? kCertText_SelfSignedTrusted : kCertText_SelfSignedExpired;
+            else
+                m_enmCertText = !certificate.GetExpired() ? kCertText_IssuedTrusted     : kCertText_IssuedExpired;
+        }
+        else
+        {
+            /* Not trusted!  Must ask the user whether to continue in this case: */
+            m_enmCertText = !certificate.GetExpired() ? kCertText_SelfSignedUnverified : kCertText_SelfSignedUnverified;
+
+            /* Translate page early: */
+            retranslateUi();
+
+            /* Instantiate the dialog: */
+            QPointer<UIApplianceUnverifiedCertificateViewer> pDialog = new UIApplianceUnverifiedCertificateViewer(this, certificate);
+            AssertPtrReturnVoid(pDialog.data());
+
+            /* Show viewer in modal mode: */
+            int iResultCode = pDialog->exec();
+
+            /* Leave if destroyed prematurely: */
+            if (!pDialog)
+                return;
+            /* Delete viewer: */
+            if (pDialog)
+            {
+                delete pDialog;
+                pDialog = 0;
+            }
+
+            /* Dismiss the entire import-appliance wizard if user rejects certificate: */
+            if (iResultCode == QDialog::Rejected)
+                wizard()->reject();
+        }
+    }
+
+    /* Translate page: */
+    retranslateUi();
+}
+
+void UIWizardImportAppPageBasic2::cleanupPage()
+{
+    /* Rollback settings: */
+    m_pApplianceWidget->restoreDefaults();
+    /* Call to base-class: */
+    UIWizardPage::cleanupPage();
+}
+
+bool UIWizardImportAppPageBasic2::validatePage()
+{
+    /* Initial result: */
+    bool fResult = true;
+
+    /* Lock finish button: */
+    startProcessing();
+
+    /* Try to import appliance: */
+    if (fResult)
+        fResult = qobject_cast<UIWizardImportApp*>(wizard())->importAppliance();
+
+    /* Unlock finish button: */
+    endProcessing();
+
+    /* Return result: */
+    return fResult;
+}
 
 
@@ -129,163 +290,2 @@
 }
 
-
-/*********************************************************************************************************************************
-*   Class UIWizardImportAppPage2 implementation.                                                                                 *
-*********************************************************************************************************************************/
-
-UIWizardImportAppPage2::UIWizardImportAppPage2()
-{
-}
-
-
-/*********************************************************************************************************************************
-*   Class UIWizardImportAppPageBasic2 implementation.                                                                            *
-*********************************************************************************************************************************/
-
-UIWizardImportAppPageBasic2::UIWizardImportAppPageBasic2(const QString &strFileName)
-    : m_enmCertText(kCertText_Uninitialized)
-{
-    /* Create widgets: */
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    {
-        m_pLabel = new QIRichTextLabel(this);
-        m_pApplianceWidget = new UIApplianceImportEditorWidget(this);
-        {
-            m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-            m_pApplianceWidget->setFile(strFileName);
-        }
-        m_pCertLabel = new QLabel("<cert label>", this);
-        pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pApplianceWidget);
-        pMainLayout->addWidget(m_pCertLabel);
-    }
-
-    /* Register classes: */
-    qRegisterMetaType<ImportAppliancePointer>();
-    /* Register fields: */
-    registerField("applianceWidget", this, "applianceWidget");
-}
-
-void UIWizardImportAppPageBasic2::retranslateUi()
-{
-    /* Translate page: */
-    setTitle(UIWizardImportApp::tr("Appliance settings"));
-
-    /* Translate widgets: */
-    m_pLabel->setText(UIWizardImportApp::tr("These are the virtual machines contained in the appliance "
-                                            "and the suggested settings of the imported VirtualBox machines. "
-                                            "You can change many of the properties shown by double-clicking "
-                                            "on the items and disable others using the check boxes below."));
-    switch (m_enmCertText)
-    {
-        case kCertText_Unsigned:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance is not signed"));
-            break;
-        case kCertText_IssuedTrusted:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (trusted)").arg(m_strSignedBy));
-            break;
-        case kCertText_IssuedExpired:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Appliance signed by %1 (expired!)").arg(m_strSignedBy));
-            break;
-        case kCertText_IssuedUnverified:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Unverified signature by %1!").arg(m_strSignedBy));
-            break;
-        case kCertText_SelfSignedTrusted:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (trusted)").arg(m_strSignedBy));
-            break;
-        case kCertText_SelfSignedExpired:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Self signed by %1 (expired!)").arg(m_strSignedBy));
-            break;
-        case kCertText_SelfSignedUnverified:
-            m_pCertLabel->setText(UIWizardImportApp::tr("Unverified self signed signature by %1!").arg(m_strSignedBy));
-            break;
-        default:
-            AssertFailed();
-        case kCertText_Uninitialized:
-            m_pCertLabel->setText("<uninitialized page>");
-            break;
-    }
-}
-
-void UIWizardImportAppPageBasic2::initializePage()
-{
-    /* Acquire appliance and certificate: */
-    CAppliance *pAppliance = m_pApplianceWidget->appliance();
-    CCertificate certificate = pAppliance->GetCertificate();
-    if (certificate.isNull())
-        m_enmCertText = kCertText_Unsigned;
-    else
-    {
-        /* Pick a 'signed-by' name. */
-        m_strSignedBy = certificate.GetFriendlyName();
-
-        /* If trusted, just select the right message: */
-        if (certificate.GetTrusted())
-        {
-            if (certificate.GetSelfSigned())
-                m_enmCertText = !certificate.GetExpired() ? kCertText_SelfSignedTrusted : kCertText_SelfSignedExpired;
-            else
-                m_enmCertText = !certificate.GetExpired() ? kCertText_IssuedTrusted     : kCertText_IssuedExpired;
-        }
-        else
-        {
-            /* Not trusted!  Must ask the user whether to continue in this case: */
-            m_enmCertText = !certificate.GetExpired() ? kCertText_SelfSignedUnverified : kCertText_SelfSignedUnverified;
-
-            /* Translate page early: */
-            retranslateUi();
-
-            /* Instantiate the dialog: */
-            QPointer<UIApplianceUnverifiedCertificateViewer> pDialog = new UIApplianceUnverifiedCertificateViewer(this, certificate);
-            AssertPtrReturnVoid(pDialog.data());
-
-            /* Show viewer in modal mode: */
-            int iResultCode = pDialog->exec();
-
-            /* Leave if destroyed prematurely: */
-            if (!pDialog)
-                return;
-            /* Delete viewer: */
-            if (pDialog)
-            {
-                delete pDialog;
-                pDialog = 0;
-            }
-
-            /* Dismiss the entire import-appliance wizard if user rejects certificate: */
-            if (iResultCode == QDialog::Rejected)
-                wizard()->reject();
-        }
-    }
-
-    /* Translate page: */
-    retranslateUi();
-}
-
-void UIWizardImportAppPageBasic2::cleanupPage()
-{
-    /* Rollback settings: */
-    m_pApplianceWidget->restoreDefaults();
-    /* Call to base-class: */
-    UIWizardPage::cleanupPage();
-}
-
-bool UIWizardImportAppPageBasic2::validatePage()
-{
-    /* Initial result: */
-    bool fResult = true;
-
-    /* Lock finish button: */
-    startProcessing();
-
-    /* Try to import appliance: */
-    if (fResult)
-        fResult = qobject_cast<UIWizardImportApp*>(wizard())->importAppliance();
-
-    /* Unlock finish button: */
-    endProcessing();
-
-    /* Return result: */
-    return fResult;
-}
-
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h	(revision 60419)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h	(revision 60420)
@@ -112,5 +112,4 @@
 };
 
-
 #endif /* !___UIWizardImportAppPageBasic2_h___ */