Changeset 69004 in vbox

Timestamp:

Oct 6, 2017 2:22:50 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8674: A bit of rework for UIProgressDialog (part 4): Reworking progress-dialog close routine, to be reused.

Location:

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

Files:

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

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

@@ -29 +29 @@
 
 /* GUI includes: */
-# include "UIProgressDialog.h"
-# include "UIErrorString.h"
-# include "UISpecialControls.h"
-# include "UIModalWindowManager.h"
 # include "QIDialogButtonBox.h"
 # include "QILabel.h"
+# include "UIErrorString.h"
+# include "UIModalWindowManager.h"
+# include "UIProgressDialog.h"
+# include "UISpecialControls.h"
 # include "VBoxGlobal.h"
 # ifdef VBOX_WS_MAC
@@ -45 +45 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+
+/*********************************************************************************************************************************
+*   Class UIProgressDialog implementation.                                                                                       *
+*********************************************************************************************************************************/
 
 const char *UIProgressDialog::m_spcszOpDescTpl = "%1 ... (%2/%3)";
@@ -400 +404 @@
 }
 
+void UIProgressDialog::closeProgressDialog()
+{
+    /* If window is on the top of the stack: */
+    if (windowManager().isWindowOnTheTopOfTheModalWindowStack(this))
+    {
+        /* Progress completed? */
+        if (m_comProgress.isOk())
+            done(Accepted);
+        /* Or aborted? */
+        else
+            done(Rejected);
+
+        /* Mark progress-dialog finished: */
+        m_fEnded = true;
+    }
+}
+
 void UIProgressDialog::handleTimerEvent()
 {
-    /* We should hide progress-dialog
-     * if it was already finalized but not yet closed.
-     * This could happens in case of some other
-     * modal dialog prevents our event-loop from
-     * being exit overlapping 'this'. */
-    if (m_fEnded && !isHidden() && windowManager().isWindowOnTheTopOfTheModalWindowStack(this))
-    {
-        hide();
+    /* If progress-dialog is ended: */
+    if (m_fEnded)
+    {
+        // WORKAROUND:
+        // We should hide progress-dialog if it was already ended but not yet closed.  This could happen
+        // in case if some other modal dialog prevents our event-loop from being exit overlapping 'this'.
+        /* If window is on the top of the stack and still shown: */
+        if (!isHidden() && windowManager().isWindowOnTheTopOfTheModalWindowStack(this))
+            hide();
+
         return;
     }
-    else if (m_fEnded)
-        return;
-
-    if (!m_fEnded && (!m_comProgress.isOk() || m_comProgress.GetCompleted()))
-    {
-        /* Is this progress-dialog a top-level modal-dialog now? */
-        if (windowManager().isWindowOnTheTopOfTheModalWindowStack(this))
-        {
-            /* Progress finished: */
-            if (m_comProgress.isOk())
-            {
-                m_pProgressBar->setValue(100);
-                done(Accepted);
-            }
-            /* Progress is not valid: */
-            else
-                done(Rejected);
-
-            /* Request to exit loop: */
-            m_fEnded = true;
-            return;
-        }
-
-        /* Else we should wait until all the subsequent
-         * top-level modal-dialog(s) will be dismissed: */
-        return;
+
+    /* If progress-dialog is not yet ended but progress is aborted or completed: */
+    if (!m_comProgress.isOk() || m_comProgress.GetCompleted())
+    {
+        /* Set progress to 100%: */
+        m_pProgressBar->setValue(100);
+
+        /* Try to close the dialog: */
+        return closeProgressDialog();
     }
 
@@ -445 +451 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UIProgress implementation.                                                                                             *
+*********************************************************************************************************************************/
 
 UIProgress::UIProgress(CProgress &progress, QObject *pParent /* = 0 */)

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

@@ -24 +24 @@
 
 /* Forward declarations: */
+class QLabel;
 class QProgressBar;
-class QLabel;
 class QILabel;
 class UIMiniCancelButton;
@@ -104 +104 @@
     /** Updates progress-dialog percentage. */
     void updateProgressPercentage(int iPercent = -1);
+
+    /** Closes progress dialog (if possible). */
+    void closeProgressDialog();
 
     /** Performes timer event handling. */