Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 78109) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 78110) @@ -684,4 +684,5 @@ src/wizards/exportappliance/UIWizardExportAppPageBasic3.h \ src/wizards/exportappliance/UIWizardExportAppPageExpert.h \ + src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h \ src/wizards/importappliance/UIWizardImportApp.h \ src/wizards/importappliance/UIWizardImportAppPageBasic1.h \ @@ -1111,4 +1112,5 @@ src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp \ src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp \ + src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp \ src/wizards/importappliance/UIWizardImportApp.cpp \ src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp (revision 78110) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.cpp (revision 78110) @@ -0,0 +1,118 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIApplianceUnverifiedCertificateViewer class implementation. + */ + +/* + * Copyright (C) 2009-2019 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +/* Qt includes: */ +#include +#include +#include +#include + +/* GUI includes: */ +#include "QIDialogButtonBox.h" +#include "UIApplianceUnverifiedCertificateViewer.h" + +/* COM includes: */ +#include "COMEnums.h" +#include "CCertificate.h" + + +UIApplianceUnverifiedCertificateViewer::UIApplianceUnverifiedCertificateViewer(QWidget *pParent, + const CCertificate &comCertificate) + : QIWithRetranslateUI(pParent) + , m_comCertificate(comCertificate) + , m_pTextLabel(0) + , m_pTextBrowser(0) +{ + prepare(); +} + +void UIApplianceUnverifiedCertificateViewer::prepare() +{ + /* Create layout: */ + QVBoxLayout *pLayout = new QVBoxLayout(this); + if (pLayout) + { + /* Create text-label: */ + m_pTextLabel = new QLabel; + if (m_pTextLabel) + { + m_pTextLabel->setWordWrap(true); + + /* Add into layout: */ + pLayout->addWidget(m_pTextLabel); + } + + /* Create text-browser: */ + m_pTextBrowser = new QTextBrowser; + if (m_pTextBrowser) + { + m_pTextBrowser->setMinimumSize(500, 300); + + /* Add into layout: */ + pLayout->addWidget(m_pTextBrowser); + } + + /* Create button-box: */ + QIDialogButtonBox *pButtonBox = new QIDialogButtonBox; + if (pButtonBox) + { + pButtonBox->setStandardButtons(QDialogButtonBox::Yes | QDialogButtonBox::No); + pButtonBox->button(QDialogButtonBox::Yes)->setShortcut(Qt::Key_Enter); + //pButtonBox->button(QDialogButtonBox::No)->setShortcut(Qt::Key_Esc); + connect(pButtonBox, &QIDialogButtonBox::accepted, this, &UIApplianceUnverifiedCertificateViewer::accept); + connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIApplianceUnverifiedCertificateViewer::reject); + + /* Add into layout: */ + pLayout->addWidget(pButtonBox); + } + } + + /* Translate UI: */ + retranslateUi(); +} + +void UIApplianceUnverifiedCertificateViewer::retranslateUi() +{ + /* Translate dialog title: */ + setWindowTitle(tr("Unverifiable Certificate! Continue?")); + + /* Translate text-label caption: */ + if (m_comCertificate.GetSelfSigned()) + m_pTextLabel->setText(tr("The appliance is signed by an unverified self signed certificate issued by '%1'. " + "We recommend to only proceed with the importing if you are sure you should trust this entity." + ).arg(m_comCertificate.GetFriendlyName())); + else + m_pTextLabel->setText(tr("The appliance is signed by an unverified certificate issued to '%1'. " + "We recommend to only proceed with the importing if you are sure you should trust this entity." + ).arg(m_comCertificate.GetFriendlyName())); + + /* Translate text-browser contents: */ + const QString strTemplateRow = tr("%1:%2", "key: value"); + QString strTableContent; + strTableContent += strTemplateRow.arg(tr("Issuer"), QStringList(m_comCertificate.GetIssuerName().toList()).join(", ")); + strTableContent += strTemplateRow.arg(tr("Subject"), QStringList(m_comCertificate.GetSubjectName().toList()).join(", ")); + strTableContent += strTemplateRow.arg(tr("Not Valid Before"), m_comCertificate.GetValidityPeriodNotBefore()); + strTableContent += strTemplateRow.arg(tr("Not Valid After"), m_comCertificate.GetValidityPeriodNotAfter()); + strTableContent += strTemplateRow.arg(tr("Serial Number"), m_comCertificate.GetSerialNumber()); + strTableContent += strTemplateRow.arg(tr("Self-Signed"), m_comCertificate.GetSelfSigned() ? tr("True") : tr("False")); + strTableContent += strTemplateRow.arg(tr("Authority (CA)"), m_comCertificate.GetCertificateAuthority() ? tr("True") : tr("False")); +// strTableContent += strTemplateRow.arg(tr("Trusted"), m_comCertificate.GetTrusted() ? tr("True") : tr("False")); + strTableContent += strTemplateRow.arg(tr("Public Algorithm"), tr("%1 (%2)", "value (clarification)").arg(m_comCertificate.GetPublicKeyAlgorithm()).arg(m_comCertificate.GetPublicKeyAlgorithmOID())); + strTableContent += strTemplateRow.arg(tr("Signature Algorithm"), tr("%1 (%2)", "value (clarification)").arg(m_comCertificate.GetSignatureAlgorithmName()).arg(m_comCertificate.GetSignatureAlgorithmOID())); + strTableContent += strTemplateRow.arg(tr("X.509 Version Number"), QString::number(m_comCertificate.GetVersionNumber())); + m_pTextBrowser->setText(QString("%1
").arg(strTableContent)); +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h (revision 78110) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIApplianceUnverifiedCertificateViewer.h (revision 78110) @@ -0,0 +1,63 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIApplianceUnverifiedCertificateViewer class declaration. + */ + +/* + * Copyright (C) 2009-2019 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + +#ifndef FEQT_INCLUDED_SRC_wizards_importappliance_UIApplianceUnverifiedCertificateViewer_h +#define FEQT_INCLUDED_SRC_wizards_importappliance_UIApplianceUnverifiedCertificateViewer_h +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +/* GUI includes: */ +#include "QIDialog.h" +#include "QIWithRetranslateUI.h" + +/* Forward declarations: */ +class QLabel; +class QTextBrowser; +class CCertificate; + +/** QIDialog extension + * asking for consent to continue with unverifiable certificate. */ +class UIApplianceUnverifiedCertificateViewer : public QIWithRetranslateUI +{ + Q_OBJECT; + +public: + + /** Constructs appliance @a comCertificate viewer for passed @a pParent. */ + UIApplianceUnverifiedCertificateViewer(QWidget *pParent, const CCertificate &comCertificate); + +protected: + + /** Prepares all. */ + void prepare(); + + /** Handles translation event. */ + virtual void retranslateUi() /* override */; + +private: + + /** Holds the certificate reference. */ + const CCertificate &m_comCertificate; + + /** Holds the text-label instance. */ + QLabel *m_pTextLabel; + /** Holds the text-browser instance. */ + QTextBrowser *m_pTextBrowser; +}; + +#endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIApplianceUnverifiedCertificateViewer_h */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (revision 78109) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp (revision 78110) @@ -19,11 +19,9 @@ #include #include -#include -#include #include /* GUI includes: */ -#include "QIDialogButtonBox.h" #include "QIRichTextLabel.h" +#include "UIApplianceUnverifiedCertificateViewer.h" #include "UIWizardImportApp.h" #include "UIWizardImportAppPageBasic2.h" @@ -217,93 +215,2 @@ return fResult; } - - -/********************************************************************************************************************************* -* Class UIApplianceUnverifiedCertificateViewer implementation. * -*********************************************************************************************************************************/ - -UIApplianceUnverifiedCertificateViewer::UIApplianceUnverifiedCertificateViewer(QWidget *pParent, const CCertificate &comCertificate) - : QIWithRetranslateUI(pParent) - , m_comCertificate(comCertificate) - , m_pTextLabel(0) - , m_pTextBrowser(0) -{ - prepare(); -} - -void UIApplianceUnverifiedCertificateViewer::prepare() -{ - /* Create layout: */ - QVBoxLayout *pLayout = new QVBoxLayout(this); - if (pLayout) - { - /* Create text-label: */ - m_pTextLabel = new QLabel; - if (m_pTextLabel) - { - m_pTextLabel->setWordWrap(true); - - /* Add into layout: */ - pLayout->addWidget(m_pTextLabel); - } - - /* Create text-browser: */ - m_pTextBrowser = new QTextBrowser; - if (m_pTextBrowser) - { - m_pTextBrowser->setMinimumSize(500, 300); - - /* Add into layout: */ - pLayout->addWidget(m_pTextBrowser); - } - - /* Create button-box: */ - QIDialogButtonBox *pButtonBox = new QIDialogButtonBox; - if (pButtonBox) - { - pButtonBox->setStandardButtons(QDialogButtonBox::Yes | QDialogButtonBox::No); - pButtonBox->button(QDialogButtonBox::Yes)->setShortcut(Qt::Key_Enter); - //pButtonBox->button(QDialogButtonBox::No)->setShortcut(Qt::Key_Esc); - connect(pButtonBox, &QIDialogButtonBox::accepted, this, &UIApplianceUnverifiedCertificateViewer::accept); - connect(pButtonBox, &QIDialogButtonBox::rejected, this, &UIApplianceUnverifiedCertificateViewer::reject); - - /* Add into layout: */ - pLayout->addWidget(pButtonBox); - } - } - - /* Translate UI: */ - retranslateUi(); -} - -void UIApplianceUnverifiedCertificateViewer::retranslateUi() -{ - /* Translate dialog title: */ - setWindowTitle(tr("Unverifiable Certificate! Continue?")); - - /* Translate text-label caption: */ - if (m_comCertificate.GetSelfSigned()) - m_pTextLabel->setText(tr("The appliance is signed by an unverified self signed certificate issued by '%1'. " - "We recommend to only proceed with the importing if you are sure you should trust this entity." - ).arg(m_comCertificate.GetFriendlyName())); - else - m_pTextLabel->setText(tr("The appliance is signed by an unverified certificate issued to '%1'. " - "We recommend to only proceed with the importing if you are sure you should trust this entity." - ).arg(m_comCertificate.GetFriendlyName())); - - /* Translate text-browser contents: */ - const QString strTemplateRow = tr("%1:%2", "key: value"); - QString strTableContent; - strTableContent += strTemplateRow.arg(tr("Issuer"), QStringList(m_comCertificate.GetIssuerName().toList()).join(", ")); - strTableContent += strTemplateRow.arg(tr("Subject"), QStringList(m_comCertificate.GetSubjectName().toList()).join(", ")); - strTableContent += strTemplateRow.arg(tr("Not Valid Before"), m_comCertificate.GetValidityPeriodNotBefore()); - strTableContent += strTemplateRow.arg(tr("Not Valid After"), m_comCertificate.GetValidityPeriodNotAfter()); - strTableContent += strTemplateRow.arg(tr("Serial Number"), m_comCertificate.GetSerialNumber()); - strTableContent += strTemplateRow.arg(tr("Self-Signed"), m_comCertificate.GetSelfSigned() ? tr("True") : tr("False")); - strTableContent += strTemplateRow.arg(tr("Authority (CA)"), m_comCertificate.GetCertificateAuthority() ? tr("True") : tr("False")); -// strTableContent += strTemplateRow.arg(tr("Trusted"), m_comCertificate.GetTrusted() ? tr("True") : tr("False")); - strTableContent += strTemplateRow.arg(tr("Public Algorithm"), tr("%1 (%2)", "value (clarification)").arg(m_comCertificate.GetPublicKeyAlgorithm()).arg(m_comCertificate.GetPublicKeyAlgorithmOID())); - strTableContent += strTemplateRow.arg(tr("Signature Algorithm"), tr("%1 (%2)", "value (clarification)").arg(m_comCertificate.GetSignatureAlgorithmName()).arg(m_comCertificate.GetSignatureAlgorithmOID())); - strTableContent += strTemplateRow.arg(tr("X.509 Version Number"), QString::number(m_comCertificate.GetVersionNumber())); - m_pTextBrowser->setText(QString("%1
").arg(strTableContent)); -} Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h (revision 78109) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.h (revision 78110) @@ -23,6 +23,4 @@ /* GUI includes: */ -#include "QIDialog.h" -#include "QIWithRetranslateUI.h" #include "UIWizardImportAppDefs.h" #include "UIWizardPage.h" @@ -30,8 +28,5 @@ /* Forward declarations: */ class QLabel; -class QTextBrowser; -class QDialogButtonBox; class QIRichTextLabel; -class CCertificate; /** UIWizardPageBase extension for 2nd page of the Import Appliance wizard. */ @@ -92,33 +87,3 @@ }; -/** QIDialog extension - * asking for consent to continue with unverifiable certificate. */ -class UIApplianceUnverifiedCertificateViewer : public QIWithRetranslateUI -{ - Q_OBJECT; - -public: - - /** Constructs appliance @a certificate viewer for passed @a pParent. */ - UIApplianceUnverifiedCertificateViewer(QWidget *pParent, const CCertificate &comCertificate); - -protected: - - /** Prepares all. */ - void prepare(); - - /** Handles translation event. */ - virtual void retranslateUi() /* override */; - -private: - - /** Holds the certificate reference. */ - const CCertificate &m_comCertificate; - - /** Holds the text-label instance. */ - QLabel *m_pTextLabel; - /** Holds the text-browser instance. */ - QTextBrowser *m_pTextBrowser; -}; - #endif /* !FEQT_INCLUDED_SRC_wizards_importappliance_UIWizardImportAppPageBasic2_h */