Changeset 27678 in vbox

Timestamp:

Mar 24, 2010 5:59:33 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: little cleanup for additions downloader.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (4 diffs)
• normal/UIMachineWindowNormal.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1481 +1481 @@
         connect(pDl, SIGNAL(downloadFinished(const QString&)),
                 uisession(), SLOT(sltInstallGuestAdditionsFrom(const QString&)));
-        /* Some of the modes may show additional info of the download progress. */
-        foreach (UIMachineWindow *pWindow, machineWindows())
-            pWindow->prepareAdditionsDownloader();
+        /* Some of the modes may show additional info of the download progress: */
+        emit sigDownloaderAdditionsCreated();
         /* Start the download: */
         pDl->startDownload();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -82 +82 @@
 #endif /* Q_WS_MAC */
 
+signals:
+
+    /* Signal to notify listeners about additions downloader created: */
+    void sigDownloaderAdditionsCreated();
+
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -391 +391 @@
 }
 
-void UIMachineWindow::prepareAdditionsDownloader()
-{
-}
-
 void UIMachineWindow::prepareMachineViewContainer()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -79 +79 @@
     virtual void prepareWindowIcon();
     virtual void prepareConsoleConnections();
-    virtual void prepareAdditionsDownloader();
     virtual void prepareMachineViewContainer();
     //virtual void loadWindowSettings() {}

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -142 +142 @@
 {
     UIMachineWindow::sltTryClose();
+}
+
+void UIMachineWindowNormal::sltDownloaderAdditionsEmbed()
+{
+    /* If there is an additions download running show the process bar: */
+    if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current())
+        statusBar()->addWidget(pDl->processWidget(this), 0);
 }
 
@@ -411 +418 @@
     statusBar()->addPermanentWidget(pIndicatorBox, 0);
 
-    /* Add the additions downloader progress bar to the status bar, if a
-     * download is actually running. */
-    prepareAdditionsDownloader();
+    /* Add the additions downloader progress bar to the status bar,
+     * if a download is actually running: */
+    sltDownloaderAdditionsEmbed();
 
     /* Create & start timer to update LEDs: */
@@ -426 +433 @@
 }
 
-void UIMachineWindowNormal::prepareAdditionsDownloader()
-{
-    /* If there is an Additions download running show the process bar. */
-    if (UIDownloaderAdditions *pDl = UIDownloaderAdditions::current())
-        statusBar()->addWidget(pDl->processWidget(this), 0);
-}
-
 void UIMachineWindowNormal::prepareConnections()
 {
@@ -438 +438 @@
     connect(&vboxGlobal().settings(), SIGNAL(propertyChanged(const char *, const char *)),
             this, SLOT(sltProcessGlobalSettingChange(const char *, const char *)));
+    /* Setup additions downloader listener: */
+    connect(machineLogic(), SIGNAL(sigDownloaderAdditionsCreated()), this, SLOT(sltDownloaderAdditionsEmbed()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -69 +69 @@
     void sltTryClose();
 
+    /* Downloader listeners: */
+    void sltDownloaderAdditionsEmbed();
+
 private:
 
@@ -91 +94 @@
     void prepareMenu();
     void prepareStatusBar();
-    void prepareAdditionsDownloader();
     void prepareConnections();
     void prepareMachineView();