Changeset 91878 in vbox

Timestamp:

Oct 20, 2021 11:29:07 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UIWizardExportApp: Migrate CVFSExplorer related progresses to notifiction-center.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (2 diffs)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -1932 +1932 @@
 
 /*********************************************************************************************************************************
+*   Class UINotificationProgressVFSExplorerUpdate implementation.                                                                *
+*********************************************************************************************************************************/
+
+UINotificationProgressVFSExplorerUpdate::UINotificationProgressVFSExplorerUpdate(const CVFSExplorer &comExplorer)
+    : m_comExplorer(comExplorer)
+{
+}
+
+QString UINotificationProgressVFSExplorerUpdate::name() const
+{
+    return UINotificationProgress::tr("Updating VFS explorer ...");
+}
+
+QString UINotificationProgressVFSExplorerUpdate::details() const
+{
+    return UINotificationProgress::tr("<b>Path:</b> %1").arg(m_strPath);
+}
+
+CProgress UINotificationProgressVFSExplorerUpdate::createProgress(COMResult &comResult)
+{
+    /* Acquire path: */
+    m_strPath = m_comExplorer.GetPath();
+    if (!m_comExplorer.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comExplorer;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comExplorer.Update();
+    /* Store COM result: */
+    comResult = m_comExplorer;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressVFSExplorerFilesRemove implementation.                                                           *
+*********************************************************************************************************************************/
+
+UINotificationProgressVFSExplorerFilesRemove::UINotificationProgressVFSExplorerFilesRemove(const CVFSExplorer &comExplorer,
+                                                                                           const QVector<QString> &files)
+    : m_comExplorer(comExplorer)
+    , m_files(files)
+{
+}
+
+QString UINotificationProgressVFSExplorerFilesRemove::name() const
+{
+    return UINotificationProgress::tr("Removing VFS explorer files ...");
+}
+
+QString UINotificationProgressVFSExplorerFilesRemove::details() const
+{
+    return UINotificationProgress::tr("<b>Path:</b> %1<br><b>Files:</b> %2")
+                                      .arg(m_strPath)
+                                      .arg(QStringList(m_files.toList()).join(", "));
+}
+
+CProgress UINotificationProgressVFSExplorerFilesRemove::createProgress(COMResult &comResult)
+{
+    /* Acquire path: */
+    m_strPath = m_comExplorer.GetPath();
+    if (!m_comExplorer.isOk())
+    {
+        /* Store COM result: */
+        comResult = m_comExplorer;
+        /* Return progress-wrapper: */
+        return CProgress();
+    }
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = m_comExplorer.Remove(m_files);
+    /* Store COM result: */
+    comResult = m_comExplorer;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+
+/*********************************************************************************************************************************
 *   Class UINotificationProgressLaunchVSDFormCreate implementation.                                                              *
 *********************************************************************************************************************************/

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -44 +44 @@
 #include "CSession.h"
 #include "CSnapshot.h"
+#include "CVFSExplorer.h"
 #include "CVirtualSystemDescription.h"
 #include "CVirtualSystemDescriptionForm.h"
@@ -961 +962 @@
 };
 
+/** UINotificationProgress extension for VFS explorer update functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressVFSExplorerUpdate : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs VFS explorer update notification-progress.
+      * @param  comExplorer  Brings the VFS explorer being updated. */
+    UINotificationProgressVFSExplorerUpdate(const CVFSExplorer &comExplorer);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private:
+
+    /** Holds the VFS explorer being updated. */
+    CVFSExplorer  m_comExplorer;
+    /** Holds the VFS explorer path. */
+    QString       m_strPath;
+};
+
+/** UINotificationProgress extension for VFS explorer files remove functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressVFSExplorerFilesRemove : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs VFS explorer files remove notification-progress.
+      * @param  comExplorer  Brings the VFS explorer removing the files.
+      * @param  files        Brings a vector of files to be removed. */
+    UINotificationProgressVFSExplorerFilesRemove(const CVFSExplorer &comExplorer,
+                                                 const QVector<QString> &files);
+
+protected:
+
+    /** Returns object name. */
+    virtual QString name() const /* override final */;
+    /** Returns object details. */
+    virtual QString details() const /* override final */;
+    /** Creates and returns started progress-wrapper. */
+    virtual CProgress createProgress(COMResult &comResult) /* override final */;
+
+private:
+
+    /** Holds the VFS explorer removing the files. */
+    CVFSExplorer      m_comExplorer;
+    /** Holds a vector of files to be removed. */
+    QVector<QString>  m_files;
+    /** Holds the VFS explorer path. */
+    QString           m_strPath;
+};
+
 /** UINotificationProgress extension for launch VSD form create functionality. */
 class SHARED_LIBRARY_STUFF UINotificationProgressLaunchVSDFormCreate : public UINotificationProgress

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -304 +304 @@
         /* Initialize VFS explorer: */
         CVFSExplorer comExplorer = comAppliance.CreateVFSExplorer(uri(false /* fWithFile */));
-        if (comExplorer.isNotNull())
-        {
-            CProgress comProgress = comExplorer.Update();
-            if (comExplorer.isOk() && comProgress.isNotNull())
-            {
-                msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Checking files ..."),
-                                                    ":/progress_refresh_90px.png", this);
-                if (comProgress.GetCanceled())
-                    return false;
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    return msgCenter().cannotCheckFiles(comProgress, this);
-            }
-            else
-                return msgCenter().cannotCheckFiles(comExplorer, this);
-        }
-        else
+        if (!comAppliance.isOk())
             return msgCenter().cannotCheckFiles(comAppliance, this);
+
+        /* Update VFS explorer: */
+        UINotificationProgressVFSExplorerUpdate *pNotification =
+            new UINotificationProgressVFSExplorerUpdate(comExplorer);
+        if (!handleNotificationProgressNow(pNotification))
+            return false;
 
         /* Confirm overwriting for existing files: */
@@ -330 +321 @@
         if (!exists.isEmpty())
         {
-            CProgress comProgress = comExplorer.Remove(exists);
-            if (comExplorer.isOk() && comProgress.isNotNull())
-            {
-                msgCenter().showModalProgressDialog(comProgress, QApplication::translate("UIWizardExportApp", "Removing files ..."),
-                                                    ":/progress_delete_90px.png", this);
-                if (comProgress.GetCanceled())
-                    return false;
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                    return msgCenter().cannotRemoveFiles(comProgress, this);
-            }
-            else
-                return msgCenter().cannotCheckFiles(comExplorer, this);
+            /* Remove files with VFS explorer: */
+            UINotificationProgressVFSExplorerFilesRemove *pNotification =
+                new UINotificationProgressVFSExplorerFilesRemove(comExplorer, exists);
+            if (!handleNotificationProgressNow(pNotification))
+                return false;
         }