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

Timestamp:

Mar 24, 2009 3:45:22 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OVF: added support for license confirmation on OVF import

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxImportApplianceWgt.h (modified) (1 diff)
• include/VBoxImportApplianceWzd.h (modified) (1 diff)
• src/VBoxImportApplianceWgt.cpp (modified) (6 diffs)
• src/VBoxImportApplianceWzd.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxImportApplianceWgt.h

@@ -39 +39 @@
 
     bool setFile (const QString& aFile);
+    void prepareImport();
     bool import();
 
     bool isValid() const { return mAppliance != NULL; }
+    QList < QPair <QString, QString> > licenseAgreements() const;
 
     static int minGuestRAM() { return mMinGuestRAM; }

trunk/src/VBox/Frontends/VirtualBox/include/VBoxImportApplianceWzd.h

@@ -27 +27 @@
 #include "QIAbstractWizard.h"
 #include "QIWithRetranslateUI.h"
+#include "QIDialog.h"
 
 class QIWidgetValidator;
+
+class QDialogButtonBox;
+
+class VBoxImportLicenseViewer: public QIDialog
+{
+    Q_OBJECT;
+
+public:
+    VBoxImportLicenseViewer (QWidget *aParent = NULL);
+
+    void setContent (const QString &aName, const QString &aText);
+
+protected:
+    void retranslateUi();
+
+private slots:
+    void print();
+    void save();
+
+private:
+    QLabel *mCaption;
+    QTextEdit *mLicenseText;
+    QDialogButtonBox *mButtonBox;
+    QPushButton *mPrintBtn;
+    QPushButton *mSaveBtn;
+    QString mName;
+    QString mText;
+};
 
 class VBoxImportApplianceWzd : public QIWithRetranslateUI<QIAbstractWizard>,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWgt.cpp

@@ -53 +53 @@
 
 protected:
+    bool filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const;
     bool lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const;
 
@@ -754 +755 @@
     KVirtualSystemDescriptionType_Description,
     KVirtualSystemDescriptionType_OS,
+    KVirtualSystemDescriptionType_License,
     KVirtualSystemDescriptionType_CPU,
     KVirtualSystemDescriptionType_Memory,
@@ -770 +772 @@
 {}
 
+bool VirtualSystemSortProxyModel::filterAcceptsRow (int aSourceRow, const QModelIndex & aSourceParent) const
+{
+    /* By default enable all, we will explicitly filter out below */
+    if (aSourceParent.isValid())
+    {
+        QModelIndex i = aSourceParent.child (aSourceRow, 0);
+        if (i.isValid())
+        {
+            ModelItem *item = static_cast<ModelItem*> (i.internalPointer());
+            /* We filter hardware types only */
+            if (item->type() == HardwareType)
+            {
+                HardwareItem *hwItem = static_cast<HardwareItem*> (item);
+                /* The license type shouldn't be displayed */
+                if (hwItem->mType == KVirtualSystemDescriptionType_License)
+                    return false;
+            }
+        }
+    }
+    return true;
+}
+
 bool VirtualSystemSortProxyModel::lessThan (const QModelIndex &aLeft, const QModelIndex &aRight) const
 {
@@ -1060 +1084 @@
                     mTvSettings->setColumnHidden (OriginalValueSection, true);
                     mTvSettings->expandAll();
-
-// @todo can the warnings also be shown when an error occurs? I have the case here that
-// interpret() failes because there's 16 hard disks attached to four SCSI controllers,
-// and we support only one SCSI controller, and the warnings about the additional SCSI
-// controllers are not shown. Instead there's only the error message that disk X cannot
-// be attached to controller Y. I have fixed VBoxManage accordingly, but the GUI should
-// have that too. Thanks!
 
                     /* Check for warnings & if there are one display them. */
@@ -1092 +1109 @@
 }
 
+void VBoxImportApplianceWgt::prepareImport()
+{
+    if (mAppliance)
+        mModel->putBack();
+}
+
 bool VBoxImportApplianceWgt::import()
 {
     if (mAppliance)
     {
-        mModel->putBack();
         /* Start the import asynchronously */
         CProgress progress;
@@ -1117 +1139 @@
     }
     return false;
+}
+
+QList < QPair<QString, QString> > VBoxImportApplianceWgt::licenseAgreements() const
+{
+    QList < QPair<QString, QString> > list;
+
+    CVirtualSystemDescriptionVector vsds = mAppliance->GetVirtualSystemDescriptions();
+    for (int i=0; i < vsds.size(); ++i)
+    {
+        QVector<QString> license;
+        vsds[i].GetValuesByType (KVirtualSystemDescriptionType_License, 
+                                 KVirtualSystemDescriptionValueType_Original, 
+                                 license);
+        if (!license.isEmpty())
+        {
+            QVector<QString> name;
+            vsds[i].GetValuesByType (KVirtualSystemDescriptionType_Name, 
+                                     KVirtualSystemDescriptionValueType_Auto, 
+                                     name);
+            list << QPair<QString, QString> (name.first(), license.first());
+        }
+    }
+
+    return list;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxImportApplianceWzd.cpp

@@ -26 +26 @@
 #include "VBoxProblemReporter.h"
 
+/* Qt includes */
 #include <QFileInfo>
+#include <QDialogButtonBox>
+#include <QPrinter>
+#include <QPrintDialog>
+#include <QTextStream>
+
+////////////////////////////////////////////////////////////////////////////////
+// VBoxImportLicenseViewer
+
+VBoxImportLicenseViewer::VBoxImportLicenseViewer (QWidget *aParent /* = NULL */)
+  : QIDialog (aParent)
+{
+    QVBoxLayout *pMainLayout = new QVBoxLayout (this);
+    pMainLayout->setMargin (12);
+
+    mCaption = new QLabel (this);
+    mCaption->setWordWrap (true);
+    pMainLayout->addWidget (mCaption);
+
+    mLicenseText = new QTextEdit (this);
+    mLicenseText->setReadOnly (true);
+    pMainLayout->addWidget (mLicenseText);
+
+    mButtonBox = new QDialogButtonBox (QDialogButtonBox::No | QDialogButtonBox::Yes, Qt::Horizontal, this);
+    mPrintBtn = new QPushButton (this);
+    mButtonBox->addButton (mPrintBtn, QDialogButtonBox::ActionRole);
+    mSaveBtn = new QPushButton (this);
+    mButtonBox->addButton (mSaveBtn, QDialogButtonBox::ActionRole);
+    mButtonBox->button (QDialogButtonBox::Yes)->setDefault (true);
+    connect (mButtonBox, SIGNAL (rejected()),
+             this, SLOT (reject()));
+    connect (mButtonBox, SIGNAL (accepted()),
+             this, SLOT (accept()));
+    connect (mPrintBtn, SIGNAL (clicked()),
+             this, SLOT (print()));
+    connect (mSaveBtn, SIGNAL (clicked()),
+             this, SLOT (save()));
+    pMainLayout->addWidget (mButtonBox);
+
+    retranslateUi();
+}
+
+void VBoxImportLicenseViewer::setContent (const QString &aName, const QString &aText)
+{ 
+    mName = aName; 
+    mText = aText; 
+    mCaption->setText (tr ("<b>To continue importing the Appliance you must agree to the terms of the software license agreement for the Virtual System \"%1\".</b><br /><br />Click <b>Agree</b> to continue or click <b>Disagree</b> to cancel the import.").arg (mName));
+    mLicenseText->setText (mText);
+
+}
+
+void VBoxImportLicenseViewer::retranslateUi()
+{
+    setWindowTitle (tr ("Software License Agreement"));
+    mButtonBox->button (QDialogButtonBox::No)->setText (tr ("&Disagree"));
+    mButtonBox->button (QDialogButtonBox::Yes)->setText (tr ("&Agree"));
+    mPrintBtn->setText (tr ("&Print..."));
+    mSaveBtn->setText (tr ("&Save..."));
+
+    setContent (mName, mText);
+}
+
+void VBoxImportLicenseViewer::print()
+{
+    QPrinter printer;
+    QPrintDialog pd (&printer, this);
+    if (pd.exec() == QDialog::Accepted) 
+        mLicenseText->print (&printer);
+}
+
+void VBoxImportLicenseViewer::save()
+{
+    QString fileName = vboxGlobal().getSaveFileName (vboxGlobal().documentsPath(), tr("Text (*.txt)"), this, tr("Select a file to save into..."));
+    if (!fileName.isEmpty())
+    {
+        QFile file (fileName);
+        if (file.open(QFile::WriteOnly | QFile::Truncate)) 
+        {
+            QTextStream out (&file);
+            out << mLicenseText->toPlainText();
+        }
+    }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -97 +180 @@
 void VBoxImportApplianceWzd::accept()
 {
+    /* Make sure the final values are puted back. */
+    mImportSettingsWgt->prepareImport();
+    /* Check if there are license agreements the use must confirm */
+    QList < QPair <QString, QString> > licAgreements = mImportSettingsWgt->licenseAgreements();
+    if (!licAgreements.isEmpty())
+    {
+        VBoxImportLicenseViewer ilv (this);
+        for (int i=0; i < licAgreements.size(); ++i)
+        {
+            const QPair <QString, QString> &lic = licAgreements.at (i);
+            ilv.setContent (lic.first, lic.second);
+            if (ilv.exec() == QDialog::Rejected)
+                return;
+        }
+    }
+    /* Now import all virtual systems */
     if (mImportSettingsWgt->import())
         QIAbstractWizard::accept();