Changeset 86206 in vbox for trunk/src/VBox

Timestamp:

Sep 21, 2020 7:41:18 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Extend UIProgress with possibilities to cancel ongoing progress the modal way and a signal notifying listeners about ongoing progress is complete.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIProgressDialog.cpp (modified) (2 diffs)
• UIProgressDialog.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -588 +588 @@
 }
 
+void UIProgress::cancel()
+{
+    /* Make sure progress hasn't aborted/finished already: */
+    if (!m_comProgress.isOk() || m_comProgress.GetCompleted())
+        return;
+
+    /* Cancel progress first of all: */
+    m_comProgress.Cancel();
+
+    /* We are creating a locally-scoped event-loop object,
+     * but holding a pointer to it for a control needs: */
+    QEventLoop eventLoop;
+    m_pEventLoopCancel = &eventLoop;
+
+    /* Guard ourself for the case
+     * we self-destroyed in our event-loop: */
+    QPointer<UIProgress> guard = this;
+
+    /* Start the blocking event-loop: */
+    eventLoop.exec();
+
+    /* Event-loop object unblocked,
+     * Are we still valid? */
+    if (guard.isNull())
+        return;
+
+    /* Cleanup the pointer finally: */
+    m_pEventLoopCancel = 0;
+}
+
 void UIProgress::sltHandleProgressPercentageChange(const QUuid &, const int iPercent)
 {
@@ -605 +635 @@
     if (m_pEventLoopExec)
         m_pEventLoopExec->exit();
+    /* Exit from the cancel event-loop if there is any: */
+    if (m_pEventLoopCancel)
+        m_pEventLoopCancel->exit();
+
+    emit sigProgressComplete();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

@@ -194 +194 @@
     void sigProgressError(QString strErrorInfo);
 
+    /** Notifies listeners about wrapped CProgress complete. */
+    void sigProgressComplete();
+
 public:
 
@@ -204 +207 @@
     /** Executes the progress within local event-loop. */
     void exec();
+    /** Cancels the progress within local event-loop. */
+    void cancel();
 
 private slots:
@@ -231 +236 @@
     /** Holds the exec event-loop instance. */
     QPointer<QEventLoop>  m_pEventLoopExec;
+    /** Holds the cancel event-loop instance. */
+    QPointer<QEventLoop>  m_pEventLoopCancel;
 };