Changeset 18300 in vbox for trunk/src

Timestamp:

Mar 26, 2009 10:34:25 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: cancel support on long operations

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProgressDialog.h (modified) (1 diff)
• src/VBoxProgressDialog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProgressDialog.h

@@ -62 +62 @@
     virtual void closeEvent (QCloseEvent *aEvent);
 
+private slots:
+    void cancelOperation();
+
 private:
     /* Private member vars */

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp

@@ -66 +66 @@
     mCancelEnabled = aProgress.GetCancelable();
     if (mCancelEnabled)
+    {
         setCancelButtonText(tr ("&Cancel"));
+        connect (this, SIGNAL (canceled()),
+                 this, SLOT (cancelOperation()));
+    }
 }
 
@@ -89 +93 @@
 }
 
+void VBoxProgressDialog::cancelOperation()
+{
+    mProgress.Cancel();
+}
+
 void VBoxProgressDialog::timerEvent (QTimerEvent * /* aEvent */)
 {
-    if (!mEnded && (!mProgress.isOk() || mProgress.GetCompleted()))
+    if (!mEnded && (!mProgress.isOk() || mProgress.GetCompleted() || mProgress.GetCanceled()))
     {
         /* Progress finished */