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

Timestamp:

May 6, 2015 4:38:21 PM (10 years ago)

Author:

vboxsync

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

100100

Message:

FE/Qt: Progress-dialog: Make sure wrapped CProgress is completed upon the progress-dialog destruction.

Location:

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

Files:

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

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

@@ -133 +133 @@
 }
 
+UIProgressDialog::~UIProgressDialog()
+{
+    /* Wait for CProgress to complete: */
+    m_progress.WaitForCompletion(-1);
+    /* Call the timer event handling delegate: */
+    handleTimerEvent();
+}
+
 void UIProgressDialog::retranslateUi()
 {
@@ -202 +210 @@
 }
 
-void UIProgressDialog::timerEvent(QTimerEvent* /* pEvent */)
+void UIProgressDialog::timerEvent(QTimerEvent*)
+{
+    /* Call the timer event handling delegate: */
+    handleTimerEvent();
+}
+
+void UIProgressDialog::closeEvent(QCloseEvent *pEvent)
+{
+    if (m_fCancelEnabled)
+        sltCancelOperation();
+    else
+        pEvent->ignore();
+}
+
+void UIProgressDialog::sltCancelOperation()
+{
+    m_pCancelBtn->setEnabled(false);
+    m_progress.Cancel();
+}
+
+void UIProgressDialog::handleTimerEvent()
 {
     /* We should hide progress-dialog
@@ -315 +343 @@
 }
 
-void UIProgressDialog::closeEvent(QCloseEvent *pEvent)
-{
-    if (m_fCancelEnabled)
-        sltCancelOperation();
-    else
-        pEvent->ignore();
-}
-
-void UIProgressDialog::sltCancelOperation()
-{
-    m_pCancelBtn->setEnabled(false);
-    m_progress.Cancel();
-}
-
 
 UIProgress::UIProgress(CProgress &progress, QObject *pParent /* = 0 */)

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

@@ -49 +49 @@
 public:
 
-    /* Constructor/destructor: */
+    /** Constructor. */
     UIProgressDialog(CProgress &progress, const QString &strTitle,
                      QPixmap *pImage = 0, int cMinDuration = 2000, QWidget *pParent = 0);
+    /** Destructor. */
+    ~UIProgressDialog();
 
     /* API: Run stuff: */
@@ -79 +81 @@
 
 private:
+
+    /** Timer event handling delegate. */
+    void handleTimerEvent();
 
     /* Variables: */