Changeset 34787 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 7, 2010 2:51:18 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68597

Message:

Main,VBoxManage,FE/Qt: Implemented IExtPackFile and dropped IExtPackManager::Install.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxProblemReporter.cpp (modified) (2 diffs)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• selector/VBoxSelectorWnd.cpp (modified) (2 diffs)
• settings/global/UIGlobalSettingsExtension.cpp (modified) (3 diffs)
• settings/global/UIGlobalSettingsExtension.h (modified) (1 diff)

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

@@ -45 +45 @@
 
 #if defined (Q_WS_WIN32)
-#include <Htmlhelp.h>
+# include <Htmlhelp.h>
 #endif
 
@@ -2110 +2110 @@
 }
 
-void VBoxProblemReporter::cannotInstallExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /* = 0 */)
+void VBoxProblemReporter::cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /* = 0 */)
+{
+    message (pParent ? pParent : mainWindowShown(),
+             Error,
+             tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
+             formatErrorInfo(extPackManager));
+}
+
+void VBoxProblemReporter::badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /* = 0 */)
+{
+    message (pParent ? pParent : mainWindowShown(),
+             Error,
+             tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename),
+             extPackFile.GetWhyUnusable());
+}
+
+void VBoxProblemReporter::cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent /* = 0 */)
 {
     message (pParent ? pParent : mainWindowShown(),
              Error,
              tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename),
-             formatErrorInfo(extPackManager));
+             formatErrorInfo(extPackFile));
 }
 

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

@@ -338 +338 @@
     void cannotUpdateGuestAdditions (const CProgress &aProgress, QWidget *aParent /* = NULL */) const;
 
-    void cannotInstallExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent = 0);
+    void cannotOpenExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent = 0);
+    void badExtPackFile(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent = 0);
+    void cannotInstallExtPack(const QString &strFilename, const CExtPackFile &extPackFile, QWidget *pParent = 0);
     void cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, QWidget *pParent = 0);
     bool confirmRemovingPackage(const QString &strPackName, QWidget *pParent = 0);

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp

@@ -39 +39 @@
 #include "QIFileDialog.h"
 #include "UIDesktopServices.h"
+#include "UIGlobalSettingsExtension.h" /* extension pack installation */
 
 #ifdef VBOX_GUI_WITH_SYSTRAY
@@ -1011 +1012 @@
             else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxExtPackFileExts))
             {
-                CExtPackManager extPackManager = vboxGlobal().virtualBox().GetExtensionPackManager();
-                extPackManager.Install(strFile);
-                if (!extPackManager.isOk())
-                    vboxProblem().cannotInstallExtPack(strFile, extPackManager, this);
+                UIGlobalSettingsExtension::doInstallation(strFile, this, NULL);
             }
         }

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

@@ -104 +104 @@
 }
 
+/**
+ * Attempt the actual installation.
+ *
+ * This code is shared by UIGlobalSettingsExtension::sltInstallPackage and
+ * VBoxSelectorWnd::sltOpenUrls.
+ * @todo    Is there perhaps a better home for this method?
+ *
+ * @returns true if successfully installed, false if not.
+ * @param   strFilePath     The path to the tarball.
+ * @param   pParent         The parent widget.
+ * @param   pstrExtPackName Where to return the extension pack name. Optional.
+ */
+/*static*/ bool UIGlobalSettingsExtension::doInstallation(QString const &strFilePath, QWidget *pParent, QString *pstrExtPackName)
+{
+    bool fInstalled = false;
+
+    /*
+     * Open the extpack tarball via IExtPackManager.
+     */
+    CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
+    CExtPackFile extPackFile = manager.OpenExtPackFile(strFilePath);
+    if (manager.isOk())
+    {
+        if (pstrExtPackName)
+            *pstrExtPackName = extPackFile.GetName();
+        if (extPackFile.GetUsable())
+        {
+            bool fAck = true;
+            /** @todo display big fat warning message. */
+
+            if (fAck)
+            {
+                /** @todo display licenses.  */
+            }
+
+            /*
+             * Install it if everything was ACKed by the user.
+             */
+            if (fAck)
+            {
+                extPackFile.Install();
+                if (extPackFile.isOk())
+                    fInstalled = true;
+                else
+                    vboxProblem().cannotInstallExtPack(strFilePath, extPackFile, pParent);
+            }
+        }
+        else
+            vboxProblem().badExtPackFile(strFilePath, extPackFile, pParent);
+    }
+    else
+        vboxProblem().cannotOpenExtPack(strFilePath, manager, pParent);
+
+    return fInstalled;
+}
+
 /* Load data to cashe from corresponding external object(s),
  * this task COULD be performed in other than GUI thread: */
@@ -208 +264 @@
         extensions << QString("*.%1").arg(VBoxDefs::VBoxExtPackFileExts[i]);
     QString strFilter = tr("Extension package files (%1)").arg(extensions.join(" "));
+
     /* Create open file dialog: */
     QStringList fileNames = QIFileDialog::getOpenFileNames(strBaseFolder, strFilter, this, strTitle, 0, true, true);
@@ -213 +270 @@
         strFilePath = fileNames.at(0);
 
-    /* Install chosen package: */
+    /*
+     * Install chosen package.
+     */
     if (!strFilePath.isEmpty())
     {
-        /* Get package manager: */
-        CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
-        /* Install package & get the name of newly installed package: */
-        QString strAddedPackageName = manager.Install(strFilePath);
-        if (manager.isOk())
+        QString strExtPackName;
+        if (doInstallation(strFilePath, this, &strExtPackName))
         {
-            /* Get the newly added package: */
-            const CExtPack &package = manager.Find(strAddedPackageName);
-            /* Add newly added package into cache: */
+            /*
+             * Insert the fresly installed extension pack, mark it as
+             * current in the tree and sort by name (col 1).
+             */
+            CExtPackManager manager = vboxGlobal().virtualBox().GetExtensionPackManager();
+            const CExtPack &package = manager.Find(strExtPackName);
             m_cache.m_items << fetchData(package);
-            /* Add newly added package into tree: */
             UIExtensionPackageItem *pItem = new UIExtensionPackageItem(m_pPackagesTree, m_cache.m_items.last());
-            /* Set the newly created item as current: */
             m_pPackagesTree->setCurrentItem(pItem);
-            /* Sort the tree by <name> column: */
             m_pPackagesTree->sortByColumn(1, Qt::AscendingOrder);
         }
-        else vboxProblem().cannotInstallExtPack(strFilePath, manager, this);
     }
 }

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

@@ -51 +51 @@
     UIGlobalSettingsExtension();
 
+    static bool doInstallation(QString const &strFilePath, QWidget *pParent, QString *pstrExtPackName);
+
 protected: