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

Timestamp:

Jun 4, 2019 2:59:37 PM (6 years ago)

Author:

vboxsync

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

131095

Message:

FE/Qt: bugref:9434: UIProgressDialog: Cache current operation weight among other progress parameters; Use agreement implemented in r131088 and r131090 to reflect infinite progress animation if the only operation weight is equal to 1.

Location:

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

Files:

• UIProgressDialog.cpp (modified) (3 diffs)
• UIProgressDialog.h (modified) (1 diff)

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

@@ -69 +69 @@
     , m_cOperations(m_comProgress.GetOperationCount())
     , m_uCurrentOperation(m_comProgress.GetOperation() + 1)
+    , m_uCurrentOperationWeight(m_comProgress.GetOperationWeight())
     , m_fCancelEnabled(false)
     , m_fEnded(false)
@@ -316 +317 @@
                 {
                     /* Configure progress-bar: */
-                    m_pProgressBar->setMaximum(100);
+                    // WORKAROUND:
+                    // Based on agreement implemented in r131088 and r131090,
+                    // if progress has just one operation with weight equal to 1,
+                    // we should make it "infinite" by setting maximum to minimum.
+                    if (m_uCurrentOperation == 1 && m_uCurrentOperationWeight == 1)
+                        m_pProgressBar->setMaximum(0);
+                    else
+                        m_pProgressBar->setMaximum(100);
                     m_pProgressBar->setValue(0);
 
@@ -458 +466 @@
         {
             m_uCurrentOperation = uNewOp;
+            m_uCurrentOperationWeight = m_comProgress.GetOperationWeight();
             m_pLabelDescription->setText(QString(m_spcszOpDescTpl)
                                        .arg(m_comProgress.GetOperationDescription())

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

@@ -155 +155 @@
     /** Holds the number of current operation. */
     ulong        m_uCurrentOperation;
+    /** Holds the weight of current operation. */
+    ulong        m_uCurrentOperationWeight;
     /** Holds whether progress cancel is enabled. */
     bool         m_fCancelEnabled;