Changeset 66152 in vbox for trunk/src

Timestamp:

Mar 17, 2017 10:19:21 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8718: Don't check for ExtPack update if the GUI was started by double clicking a .vbox-extpack file (or with similar argument to VBox executable file), but only while EP update proposal is on the screen, e.g. resume usual checks after user performed or canceled EP update.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (2 diffs)
• net/UIUpdateManager.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -235 +235 @@
     , m_fSeparateProcess(false)
     , m_pMediumEnumerator(0)
+    , m_fEPInstallationRequested(false)
 #ifdef VBOX_WS_X11
     , m_fCompositingManagerRunning(false)

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

@@ -172 +172 @@
     QList<QUrl> &argUrlList() { return m_ArgUrlList; }
 
+    /** Returns whether the Extension Pack installation was requested at startup. */
+    bool isEPInstallationRequested() const { return m_fEPInstallationRequested; }
+    /** Defines whether the Extension Pack installation was @a fRequested at startup. */
+    void setEPInstallationRequested(bool fRequested) { m_fEPInstallationRequested = fRequested; }
+
 #ifdef VBOX_WS_X11
     /** X11: Returns whether the Window Manager we are running at is composition one. */
@@ -556 +561 @@
     UIMediumEnumerator *m_pMediumEnumerator;
     mutable QReadWriteLock m_mediumEnumeratorDtorRwLock;
+
+    /** Holds whether the Extension Pack installation was requested at startup. */
+    bool m_fEPInstallationRequested;
 
 #ifdef VBOX_WS_X11

trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp

@@ -352 +352 @@
     void sltStartStep()
     {
+        /* Return if Selector UI has a direct request to install EP: */
+        if (vboxGlobal().isEPInstallationRequested())
+        {
+            emit sigStepComplete();
+            return;
+        }
+
         /* Return if already downloading: */
         if (UIDownloaderExtensionPack::current())

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

@@ -370 +370 @@
             else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxExtPackFileExts))
             {
+                /* Prevent update manager from proposing us to update EP: */
+                vboxGlobal().setEPInstallationRequested(true);
+                /* Propose the user to install EP described by the arguments @a list. */
                 UIGlobalSettingsExtension::doInstallation(strFile, QString(), this, NULL);
+                /* Allow update manager to propose us to update EP: */
+                vboxGlobal().setEPInstallationRequested(false);
             }
         }