Changeset 34519 in vbox

Timestamp:

Nov 30, 2010 2:17:27 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: install extension packs on double click

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxDefs.cpp (modified) (1 diff)
• globals/VBoxDefs.h (modified) (1 diff)
• globals/VBoxProblemReporter.cpp (modified) (1 diff)
• globals/VBoxProblemReporter.h (modified) (1 diff)
• platform/darwin/Info.plist (modified) (1 diff)
• selector/VBoxSelectorWnd.cpp (modified) (1 diff)

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

@@ -90 +90 @@
 
 QStringList VBoxDefs::VBoxFileExts = QStringList() << "xml" << "vbox";
+QStringList VBoxDefs::VBoxExtPackFileExts = QStringList() << "vbox-extpack";
 QStringList VBoxDefs::OVFFileExts = QStringList() << "ovf" << "ova";
 

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

@@ -167 +167 @@
 
     static QStringList VBoxFileExts;
+    static QStringList VBoxExtPackFileExts;
     static QStringList OVFFileExts;
 };

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

@@ -2410 +2410 @@
 }
 
+void VBoxProblemReporter::cannotInstallExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent /* = 0 */)
+{
+    message (pParent ? pParent : mainWindowShown(),
+             Error,
+             tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename),
+             formatErrorInfo(extPackManager));
+}
+
 void VBoxProblemReporter::warnAboutIncorrectPort (QWidget *pParent) const
 {

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

@@ -383 +383 @@
     void cannotUpdateGuestAdditions (const CProgress &aProgress, QWidget *aParent /* = NULL */) const;
 
+    void cannotInstallExtPack(const QString &strFilename, const CExtPackManager &extPackManager, QWidget *pParent = 0);
+
     void warnAboutIncorrectPort(QWidget *pParent) const;
     bool confirmCancelingPortForwardingDialog(QWidget *pParent) const;

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/Info.plist

@@ -20 +20 @@
       <key>CFBundleTypeName</key>               <string>VirtualBox Extension Pack</string>
       <key>CFBundleTypeExtensions</key>         <array><string>vbox-extpack</string></array>
-      <key>CFBundleTypeRole</key>               <string>None</string>
+      <key>CFBundleTypeRole</key>               <string>Viewer</string>
+      <key>LSHandlerRank</key>                  <string>Owner</string>
       <key>CFBundleTypeIconFile</key>           <string>virtualbox-vbox-extpack</string>
      </dict>

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

@@ -1009 +1009 @@
                 break;
             }
+            else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxDefs::VBoxExtPackFileExts))
+            {
+                CExtPackManager extPackManager = vboxGlobal().virtualBox().GetExtensionPackManager();
+                extPackManager.Install(strFile);
+                if (!extPackManager.isOk())
+                    vboxProblem().cannotInstallExtPack(strFile, extPackManager, this);
+            }
         }
     }