Changeset 72435 in vbox for trunk

Timestamp:

Jun 4, 2018 4:56:42 PM (7 years ago)

Author:

vboxsync

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

122907

Message:

FE/Qt: bugref:9049: Move a bit of Extension Pack Downloading related code from VBoxGlobal to Update Manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -332 +332 @@
     , m_pIconPool(0)
     , m_pMediumEnumerator(0)
-    , m_fEPInstallationRequested(false)
 {
     /* Assign instance: */

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

@@ -555 +555 @@
                                           QWidget *pParent,
                                           QString *pstrExtPackName);
-
-        /** @todo remove */
-        bool isEPInstallationRequested() const { return m_fEPInstallationRequested; }
-        /** @todo remove */
-        void setEPInstallationRequested(bool fRequested) { m_fEPInstallationRequested = fRequested; }
     /** @} */
 
@@ -865 +860 @@
     /** @} */
 
-    /** @todo remove */
-    bool m_fEPInstallationRequested;
-
 #if defined(VBOX_WS_WIN) && defined(VBOX_GUI_WITH_SHARED_LIBRARY)
     /** @name ATL stuff.

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

@@ -400 +400 @@
 void UIUpdateStepVirtualBoxExtensionPack::sltStartStep()
 {
-    /* Return if Selector UI has a direct request to install EP: */
-    if (vboxGlobal().isEPInstallationRequested())
+    /* Return if Selector UI issued a direct request to install EP: */
+    if (gUpdateManager->isEPInstallationRequested())
     {
         emit sigStepComplete();
@@ -490 +490 @@
     /* Warn the user about extension pack was downloaded and saved, propose to install it: */
     if (msgCenter().proposeInstallExtentionPack(GUI_ExtPackName, strSource, QDir::toNativeSeparators(strTarget)))
-        VBoxGlobal::doExtPackInstallation(strTarget, strDigest, windowManager().networkManagerOrMainWindowShown(), NULL);
+        vboxGlobal().doExtPackInstallation(strTarget, strDigest, windowManager().networkManagerOrMainWindowShown(), NULL);
     /* Propose to delete the downloaded extension pack: */
     if (msgCenter().proposeDeleteExtentionPack(QDir::toNativeSeparators(strTarget)))
@@ -526 +526 @@
     , m_fIsRunning(false)
     , m_uTime(1 /* day */ * 24 /* hours */ * 60 /* minutes */ * 60 /* seconds */ * 1000 /* ms */)
+    , m_fEPInstallationRequested(false)
 {
     /* Prepare instance: */

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

@@ -48 +48 @@
     static UIUpdateManager *instance() { return s_pInstance; }
 
+    /** Returns whether the Extension Pack installation is requested. */
+    bool isEPInstallationRequested() const { return m_fEPInstallationRequested; }
+    /** Defines whether the Extension Pack installation is @a fRequested. */
+    void setEPInstallationRequested(bool fRequested) { m_fEPInstallationRequested = fRequested; }
+
 public slots:
 
@@ -72 +77 @@
     /** Holds the refresh period. */
     quint64        m_uTime;
+
+    /** Holds whether the Extension Pack installation is requested. */
+    bool  m_fEPInstallationRequested;
 };
 

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

@@ -50 +50 @@
 # include "UIToolsPaneMachine.h"
 # include "UIToolsToolbar.h"
+# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+#  include "UIUpdateManager.h"
+# endif
 # include "UIVirtualBoxEventHandler.h"
 # include "UIWizardCloneVM.h"
@@ -57 +60 @@
 #  include "UINetworkManager.h"
 #  include "UINetworkManagerIndicator.h"
-# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+# endif
 # ifdef VBOX_WS_MAC
 #  include "UIImageTools.h"
 #  include "UIWindowMenuManager.h"
 #  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
+# endif
 # ifdef VBOX_WS_X11
 #  include "UIDesktopWidgetWatchdog.h"
@@ -398 +401 @@
             else if (VBoxGlobal::hasAllowedExtension(strFile, VBoxExtPackFileExts))
             {
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
                 /* Prevent update manager from proposing us to update EP: */
-                vboxGlobal().setEPInstallationRequested(true);
+                gUpdateManager->setEPInstallationRequested(true);
+#endif
                 /* Propose the user to install EP described by the arguments @a list. */
-                VBoxGlobal::doExtPackInstallation(strFile, QString(), this, NULL);
+                vboxGlobal().doExtPackInstallation(strFile, QString(), this, NULL);
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
                 /* Allow update manager to propose us to update EP: */
-                vboxGlobal().setEPInstallationRequested(false);
+                gUpdateManager->setEPInstallationRequested(false);
+#endif
             }
         }

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

@@ -307 +307 @@
     {
         QString strExtPackName;
-        VBoxGlobal::doExtPackInstallation(strFilePath, QString(), this, &strExtPackName);
+        vboxGlobal().doExtPackInstallation(strFilePath, QString(), this, &strExtPackName);
 
         /* Since we might be reinstalling an existing package, we have to