Changeset 34811 in vbox

Timestamp:

Dec 7, 2010 6:23:35 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5386: Extension pack GUI: Show extension package license if necessary.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxLicenseViewer.cpp (modified) (3 diffs)
• VBoxLicenseViewer.h (modified) (3 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (2 diffs)

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

@@ -34 +34 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-VBoxLicenseViewer::VBoxLicenseViewer (const QString &aFilePath)
-    : QIWithRetranslateUI<QDialog> ()
-      , mFilePath (aFilePath)
-      , mLicenseText (0)
-      , mAgreeButton (0)
-      , mDisagreeButton (0)
+VBoxLicenseViewer::VBoxLicenseViewer()
+    : QIWithRetranslateUI<QDialog>()
+    , mLicenseText (0)
+    , mAgreeButton (0)
+    , mDisagreeButton (0)
 {
 #ifndef Q_WS_WIN
@@ -71 +70 @@
 }
 
-int VBoxLicenseViewer::exec()
+int VBoxLicenseViewer::showLicenseFromFile(const QString &strLicenseFileName)
 {
-    /* read & show the license file */
-    QFile file (mFilePath);
-    if (file.open (QIODevice::ReadOnly))
+    /* Read license file: */
+    QFile file(strLicenseFileName);
+    if (file.open(QIODevice::ReadOnly))
     {
-        mLicenseText->setText (file.readAll());
-        return QDialog::exec();
+        return showLicenseFromString(file.readAll());
     }
     else
     {
-        vboxProblem().cannotOpenLicenseFile (this, mFilePath);
+        vboxProblem().cannotOpenLicenseFile(this, strLicenseFileName);
         return QDialog::Rejected;
     }
+}
+
+int VBoxLicenseViewer::showLicenseFromString(const QString &strLicenseText)
+{
+    /* Set license text: */
+    mLicenseText->setText(strLicenseText);
+    return exec();
 }
 
@@ -93 +98 @@
     mAgreeButton->setText (tr ("I &Agree"));
     mDisagreeButton->setText (tr ("I &Disagree"));
+}
+
+int VBoxLicenseViewer::exec()
+{
+    return QDialog::exec();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.h

@@ -37 +37 @@
 public:
 
-    VBoxLicenseViewer (const QString &aFilePath);
+    VBoxLicenseViewer();
 
-public slots:
-
-    int exec();
+    int showLicenseFromFile(const QString &strLicenseFileName);
+    int showLicenseFromString(const QString &strLicenseText);
 
 protected:
@@ -48 +47 @@
 
 private slots:
+
+    int exec();
 
     void onScrollBarMoving (int aValue);
@@ -60 +61 @@
 
     /* Private member vars */
-    QString       mFilePath;
     QTextBrowser *mLicenseText;
     QPushButton  *mAgreeButton;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2137 +2137 @@
             return true;
 
-    VBoxLicenseViewer licenseDialog (latestFilePath);
-    bool result = licenseDialog.exec() == QDialog::Accepted;
+    VBoxLicenseViewer licenseDialog;
+    bool result = licenseDialog.showLicenseFromFile(latestFilePath) == QDialog::Accepted;
     if (result)
         virtualBox().SetExtraData (VBoxDefs::GUI_LicenseKey, (strList << latestVersion).join(","));

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -27 +27 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
+#include "VBoxLicenseViewer.h"
 
 /* Extension package item: */
@@ -129 +130 @@
         if (extPackFile.GetUsable())
         {
-            bool fAck = vboxProblem().confirmInstallingPackage(extPackFile.GetName(),
-                                                               QString("%1.%2").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision()),
-                                                               extPackFile.GetDescription());
-
-            if (fAck)
+            /* Ask user to confirm installation: */
+            QString strPackName = extPackFile.GetName();
+            QString strPackVersion = QString("%1.%2").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision());
+            QString strPackDescription = extPackFile.GetDescription();
+            if (vboxProblem().confirmInstallingPackage(strPackName, strPackVersion, strPackDescription))
             {
-                /* TODO: Display license! */
-
-                /* Install package: */
-                extPackFile.Install();
-                if (extPackFile.isOk())
-                    fInstalled = true;
-                else
-                    vboxProblem().cannotInstallExtPack(strFilePath, extPackFile, pParent);
+                /* Display license if necessary: */
+                bool fShouldBeLicenseShown = extPackFile.GetShowLicense();
+                QString strLicense = extPackFile.GetLicense();
+                VBoxLicenseViewer licenseViewer;
+                if (!fShouldBeLicenseShown || licenseViewer.showLicenseFromString(strLicense) == QDialog::Accepted)
+                {
+                    /* Install package: */
+                    extPackFile.Install();
+                    if (extPackFile.isOk())
+                        fInstalled = true;
+                    else
+                        vboxProblem().cannotInstallExtPack(strFilePath, extPackFile, pParent);
+                }
             }
         }