Changeset 4572 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2007 1:47:22 PM (17 years ago)

Author:

vboxsync

Message:

2292: Remove license display from .deb:
License Viewer implemented:

1. If the GUI/LicenseAgreed flag is not presented in the user's VirtualBox.xml configuration file extra-data (or this flag's value is not equal to LicenseX-Y.html file version X-Y) then license file LicenseX-Y.html will be displayed to the user.
2. If the file in LicenseX-Y.html format (for example, License1-3.html) is not presented in RTPathAppDocs() directory then the error-box will be displayed and application will exit (this will force the user to respect the license in case of license file is not found due to user simple removed this file).
3. If the user read the license (at least scrolls the license-view to the end) and agreed it then the license viewer will be closed and will never bother the user until another license file with higher license version appears in RTPathAppDocs() directory (for example, License1-4.html).

NOTE: Feature temporary disabled due to License1-3.html file is not defaultly generated to RTPathAppDocs() directory yet.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• include/VBoxDefs.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (1 diff)
• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (9 diffs)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -82 +82 @@
 # Sources containing local definitions of classes that use the Q_OBJECT macro
 VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
+ifeq ($(BUILD_TARGET),linux)
+VirtualBox_QT_MOCSRCS += src/VBoxGlobal.cpp
+endif
 ifdef VBOX_WITH_XPCOM
 VirtualBox_QT_MOCSRCS += src/COMDefs.cpp

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

@@ -160 +160 @@
     static const char* GUI_SuppressMessages;
     static const char* GUI_PermanentSharedFoldersAtRuntime;
+#ifdef Q_WS_X11
+    static const char* GUI_LicenseKey;
+#endif
 };
 

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

@@ -363 +363 @@
 
     /* VirtualBox helpers */
+
+#ifdef Q_WS_X11
+    bool showVirtualBoxLicense();
+#endif
 
     CSession openSession (const QUuid &id);

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

@@ -85 +85 @@
     // problem handlers
 
+#ifdef Q_WS_X11
+    void cannotFindLicenseFiles (const QString &aPath);
+    void cannotOpenLicenseFile (QWidget *aParent, const QString &aPath);
+#endif
+
     void cannotOpenURL (const QString &aURL);
 

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

@@ -29 +29 @@
 const char* VBoxDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
 const char* VBoxDefs::GUI_PermanentSharedFoldersAtRuntime = "GUI/PermanentSharedFoldersAtRuntime";
+#ifdef Q_WS_X11
+const char* VBoxDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
+#endif
 

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

@@ -33 +33 @@
 #include <qimage.h>
 #include <qlabel.h>
+
+#ifdef Q_WS_X11
+#include <qtextbrowser.h>
+#include <qpushbutton.h>
+#include <qlayout.h>
+#endif
 
 #include <qfileinfo.h>
@@ -491 +497 @@
 #endif /* Q_WS_WIN */
 
+#ifdef Q_WS_X11
+/**
+ *  This class is used to show a user license under linux.
+ */
+class VBoxLicenseViewer : public QDialog
+{
+    Q_OBJECT
+
+public:
+
+    VBoxLicenseViewer (const QString &aFilePath)
+        : QDialog (0, "VBoxLicenseViewerObject")
+        , mFilePath (aFilePath)
+        , mLicenseText (0), mAgreeButton (0), mDisagreeButton (0)
+    {
+        setCaption ("VirtualBox License");
+        setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
+
+        mLicenseText = new QTextBrowser (this);
+        mAgreeButton = new QPushButton (tr ("I &Agree"), this);
+        mDisagreeButton = new QPushButton (tr ("I &Disagree"), this);
+
+        mLicenseText->setTextFormat (Qt::RichText);
+        mAgreeButton->setEnabled (false);
+        mDisagreeButton->setEnabled (false);
+
+        connect (mLicenseText->verticalScrollBar(), SIGNAL (valueChanged (int)),
+                 SLOT (onScrollBarMoving (int)));
+        connect (mAgreeButton, SIGNAL (clicked()), SLOT (accept()));
+        connect (mDisagreeButton, SIGNAL (clicked()), SLOT (reject()));
+
+        QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10);
+        mainLayout->addWidget (mLicenseText);
+
+        QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10);
+        buttonLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
+                                                      QSizePolicy::Preferred));
+        buttonLayout->addWidget (mAgreeButton);
+        buttonLayout->addWidget (mDisagreeButton);
+
+        resize (600, 450);
+    }
+
+public slots:
+
+    int exec()
+    {
+        /* read & show the license file */
+        QFile file (mFilePath);
+        if (file.open (IO_ReadOnly))
+        {
+            mLicenseText->setText (file.readAll());
+            return QDialog::exec();
+        }
+        else
+        {
+            vboxProblem().cannotOpenLicenseFile (this, mFilePath);
+            return QDialog::Rejected;
+        }
+    }
+
+private slots:
+
+    void onScrollBarMoving (int aValue)
+    {
+        if (aValue == mLicenseText->verticalScrollBar()->maxValue())
+        {
+            mAgreeButton->setEnabled (true);
+            mDisagreeButton->setEnabled (true);
+        }
+    }
+
+private:
+
+    QString       mFilePath;
+    QTextBrowser *mLicenseText;
+    QPushButton  *mAgreeButton;
+    QPushButton  *mDisagreeButton;
+};
+#endif
+
+
 // VBoxGlobal
 ////////////////////////////////////////////////////////////////////////////////
@@ -831 +919 @@
     const ulong IOBase;
 }
-kKnownPorts[] = 
+kKnownPorts[] =
 {
     { "COM1", 4, 0x3F8 },
@@ -841 +929 @@
 };
 
-/** 
+/**
  *  Returns the list of the standard COM port names (i.e. "COMx").
  */
@@ -853 +941 @@
 }
 
-/** 
+/**
  *  Returns the name of the standard COM port corresponding to the given
  *  parameters, or "User-defined" (which is also returned when both
@@ -868 +956 @@
 }
 
-/** 
+/**
  *  Returns port parameters corresponding to the given standard COM name.
  *  Returns @c true on success, or @c false if the given port name is not one
@@ -1385 +1473 @@
                             .arg (vboxGlobal().toString (mode))
                             .arg (QDir::convertSeparators (port.GetPath()));
-                    else  
+                    else
                         data += toString (mode);
 
@@ -1491 +1579 @@
     return QString (sTableTpl). arg (detailsReport);
 }
+
+#ifdef Q_WS_X11
+bool VBoxGlobal::showVirtualBoxLicense()
+{
+    /* get the apps doc path */
+    int size = 256;
+    char *buffer = (char*) malloc (size);
+    RTPathAppDocs (buffer, size);
+    QString path (buffer);
+    free (buffer);
+    QDir docDir (path);
+    docDir.setFilter (QDir::Files);
+    docDir.setNameFilter ("License*-*.html");
+
+    /* get the license files list and search for the latest license */
+    QStringList filesList = docDir.entryList();
+    double maxVersionNumber = 0;
+    for (uint index = 0; index < filesList.count(); ++ index)
+    {
+        QRegExp regExp ("License([\\d]+-[\\d]+).html");
+        regExp.search (filesList [index]);
+        QString version = regExp.cap (1);
+        version = version.replace ("-", ".");
+        if (maxVersionNumber < version.toDouble())
+            maxVersionNumber = version.toDouble();
+    }
+    if (!maxVersionNumber)
+    {
+        vboxProblem().cannotFindLicenseFiles (path);
+        return false;
+    }
+
+    /* compose the latest license file full path */
+    QString latestVersion = QString::number (maxVersionNumber);
+    latestVersion = latestVersion.replace (".", "-");
+    QString latestFilePath = docDir.absFilePath (
+        QString ("License%1.html").arg (latestVersion));
+
+    /* check for the agreed license version */
+    QString licenseAgreed = virtualBox().GetExtraData (VBoxDefs::GUI_LicenseKey);
+    if (licenseAgreed == latestVersion)
+        return true;
+
+    VBoxLicenseViewer licenseDialog (latestFilePath);
+    bool result = licenseDialog.exec() == QDialog::Accepted;
+    if (result)
+        virtualBox().SetExtraData (VBoxDefs::GUI_LicenseKey, latestVersion);
+    return result;
+}
+#endif
 
 /**
@@ -3721 +3859 @@
 }
 
+#ifdef Q_WS_X11
+#include "VBoxGlobal.moc"
+#endif

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

@@ -450 +450 @@
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef Q_WS_X11
+void VBoxProblemReporter::cannotFindLicenseFiles (const QString &aPath)
+{
+    message
+        (0, VBoxProblemReporter::Error,
+         tr ("Failed to find any license file in "
+             "<nobr><b>%1</b></nobr> path.")
+             .arg (aPath));
+}
+
+void VBoxProblemReporter::cannotOpenLicenseFile (QWidget *aParent,
+                                                 const QString &aPath)
+{
+    message
+        (aParent, VBoxProblemReporter::Error,
+         tr ("Failed to open license file <nobr><b>%1</b></nobr>. "
+             "Check the file presence and read-permissions.")
+             .arg (aPath));
+}
+#endif
+
 void VBoxProblemReporter::cannotOpenURL (const QString &aURL)
 {
@@ -1601 +1622 @@
 }
 
-/** 
+/**
  *  Returns @c true if the user has selected to power off the machine.
  */

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

@@ -190 +190 @@
     if (vboxGlobal().isValid())
     {
+#ifdef Q_WS_X11
+        /* show the user license file */
+        //if (!vboxGlobal().showVirtualBoxLicense())
+        //    return rc;
+#endif
+
         VBoxGlobalSettings settings = vboxGlobal().settings();
         /* Process known keys */