Changeset 43855 in vbox

Timestamp:

Nov 12, 2012 11:58:16 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6338: UIProgressDialog will be reflecting cancelable state at runtime (making corresponding button enabled/disabled).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp (modified) (5 diffs)

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

@@ -50 +50 @@
   , m_progress(progress)
   , m_pImageLbl(0)
-  , m_pCancelBtn(0)
   , m_fCancelEnabled(false)
   , m_cOperations(m_progress.GetOperationCount())
@@ -109 +108 @@
     m_progressBar->setValue(0);
     m_fCancelEnabled = m_progress.GetCancelable();
-    if (m_fCancelEnabled)
-    {
-        m_pCancelBtn = new UIMiniCancelButton(this);
-        m_pCancelBtn->setFocusPolicy(Qt::ClickFocus);
-        pLayout2->addWidget(m_pCancelBtn, 0, Qt::AlignVCenter);
-        connect(m_pCancelBtn, SIGNAL(clicked()), this, SLOT(cancelOperation()));
-    }
+    m_pCancelBtn = new UIMiniCancelButton(this);
+    m_pCancelBtn->setEnabled(m_fCancelEnabled);
+    m_pCancelBtn->setFocusPolicy(Qt::ClickFocus);
+    pLayout2->addWidget(m_pCancelBtn, 0, Qt::AlignVCenter);
+    connect(m_pCancelBtn, SIGNAL(clicked()), this, SLOT(cancelOperation()));
 
     m_pEtaLbl = new QILabel(this);
@@ -143 +140 @@
 {
     m_strCancel = tr("Canceling...");
-    if (m_pCancelBtn)
-    {
-        m_pCancelBtn->setText(tr("&Cancel"));
-        m_pCancelBtn->setToolTip(tr("Cancel the current operation"));
-    }
+    m_pCancelBtn->setText(tr("&Cancel"));
+    m_pCancelBtn->setToolTip(tr("Cancel the current operation"));
 }
 
@@ -287 +281 @@
         }
         m_progressBar->setValue(m_progress.GetPercent());
+
+        /* Then cancel button: */
+        m_fCancelEnabled = m_progress.GetCancelable();
+        m_pCancelBtn->setEnabled(m_fCancelEnabled);
     }
     else
@@ -313 +311 @@
 void UIProgressDialog::cancelOperation()
 {
-    if (m_pCancelBtn)
-        m_pCancelBtn->setEnabled(false);
+    m_pCancelBtn->setEnabled(false);
     m_progress.Cancel();
 }