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

Timestamp:

Oct 15, 2021 9:45:40 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Extend UINotificationCenter with possibility to handle progresses synchronously; Convey that functionality to UINativeWizard so that it could handle intermediate progresses that way.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationCenter.cpp (modified) (2 diffs)
• notificationcenter/UINotificationCenter.h (modified) (4 diffs)
• wizards/UINativeWizard.cpp (modified) (1 diff)
• wizards/UINativeWizard.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -225 +225 @@
     AssertReturnVoid(!uId.isNull());
     return m_pModel->revokeObject(uId);
+}
+
+void UINotificationCenter::handleNow(UINotificationProgress *pProgress)
+{
+    /* Check for the recursive run: */
+    AssertMsgReturnVoid(!m_pEventLoop, ("UINotificationCenter::handleNow() is called recursively!\n"));
+
+    /* Guard progress for the case
+     * it destroyed itself in his append call: */
+    QPointer<UINotificationProgress> guardProgress = pProgress;
+    connect(pProgress, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationCenter::sltHandleProgressFinished);
+    append(pProgress);
+
+    /* Is progress still valid? */
+    if (guardProgress.isNull())
+        return;
+
+    /* Create a local event-loop: */
+    QEventLoop eventLoop;
+    m_pEventLoop = &eventLoop;
+
+    /* Guard ourself for the case
+     * we destroyed ourself in our event-loop: */
+    QPointer<UINotificationCenter> guardThis = this;
+
+    /* Start the blocking event-loop: */
+    eventLoop.exec();
+
+    /* Are we still valid? */
+    if (guardThis.isNull())
+        return;
+
+    /* Cleanup event-loop: */
+    m_pEventLoop = 0;
 }
 
@@ -361 +396 @@
 }
 
+void UINotificationCenter::sltHandleProgressFinished()
+{
+    /* Make sure event-loop is running: */
+    AssertPtrReturnVoid(m_pEventLoop.data());
+
+    /* Break the loop: */
+    m_pEventLoop->exit();
+}
+
 void UINotificationCenter::prepare()
 {

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QEventLoop>
+#include <QPointer>
 #include <QUuid>
 #include <QWidget>
@@ -79 +81 @@
     void revoke(const QUuid &uId);
 
+    /** Immediately and synchronously handles passed notification @a pProgress.
+      * @note It's a blocking call finished by sltHandleProgressFinished(). */
+    void handleNow(UINotificationProgress *pProgress);
+
 protected:
 
@@ -105 +111 @@
     /** Handles signal about model being updated. */
     void sltModelChanged();
+
+    /** Handles immediate progress being finished.
+      * @note Breaks blocking handleNow() call. */
+    void sltHandleProgressFinished();
 
 private:
@@ -160 +170 @@
     /** Holds the open-object ID. */
     QUuid   m_uOpenObjectId;
+
+    /** Holds the separate event-loop instance.
+      * @note  This event-loop is only used when the center
+      *        handles progress directly via handleNow(). */
+    QPointer<QEventLoop>  m_pEventLoop;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

@@ -79 +79 @@
 #endif /* VBOX_WS_MAC */
 
+
+void UINativeWizard::handleNotificationProgressNow(UINotificationProgress *pProgress)
+{
+    m_pNotificationCenter->handleNow(pProgress);
+}
 
 int UINativeWizard::exec()

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.h

@@ -39 +39 @@
 class UINativeWizardPage;
 class UINotificationCenter;
+class UINotificationProgress;
 
 /** Native wizard buttons. */
@@ -76 +77 @@
 {
     Q_OBJECT;
+
+public:
+
+    /** Immediately handles notification @a pProgress object. */
+    void handleNotificationProgressNow(UINotificationProgress *pProgress);
 
 public slots: