Changeset 90253 in vbox

Timestamp:

Jul 20, 2021 9:56:47 AM (4 years ago)

Author:

vboxsync

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

145792

Message:

FE/Qt: bugref:10067: Extend UIProgressTask and underlying UIProgressObject with API to acquire cancelable state.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIProgressObject.cpp (modified) (4 diffs)
• UIProgressObject.h (modified) (3 diffs)
• UIProgressTask.cpp (modified) (2 diffs)
• UIProgressTask.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressObject.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
     : QObject(pParent)
     , m_comProgress(comProgress)
+    , m_fCancelable(false)
     , m_pEventHandler(0)
 {
@@ -97 +98 @@
 void UIProgressObject::sltHandleProgressPercentageChange(const QUuid &, const int iPercent)
 {
+    /* Update cancelable value: */
+    m_fCancelable = m_comProgress.GetCancelable();
+
+    /* Notify listeners: */
     emit sigProgressChange(m_comProgress.GetOperationCount(),
                            m_comProgress.GetOperationDescription(),
@@ -121 +126 @@
 void UIProgressObject::prepare()
 {
+    /* Init cancelable value: */
+    m_fCancelable = m_comProgress.GetCancelable();
+
     /* Create CProgress event handler: */
     m_pEventHandler = new UIProgressEventHandler(this, m_comProgress);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressObject.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2020 Oracle Corporation
+ * Copyright (C) 2009-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -71 +71 @@
     virtual ~UIProgressObject() /* override */;
 
+    /** Returns whether progress is cancelable. */
+    bool isCancelable() const { return m_fCancelable; }
+
     /** Executes the progress within local event-loop. */
     void exec();
@@ -93 +96 @@
     CProgress &m_comProgress;
 
+    /** Holds whether progress is cancelable. */
+    bool  m_fCancelable;
+
     /** Holds the progress event handler instance. */
     UIProgressEventHandler *m_pEventHandler;

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressTask.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2020 Oracle Corporation
+ * Copyright (C) 2020-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
 {
     return m_pProgressObject;
+}
+
+bool UIProgressTask::isCancelable() const
+{
+    return m_pProgressObject ? m_pProgressObject->isCancelable() : false;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressTask.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2020 Oracle Corporation
+ * Copyright (C) 2020-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
     bool isRunning() const;
 
+    /** Returns whether task is cancelable. */
+    bool isCancelable() const;
+
 public slots: