Changeset 90376 in vbox for trunk

Timestamp:

Jul 28, 2021 5:11:28 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Notification signature for virtual machine move progress (in UIVirtualBoxManager) which should now go to center instead of modal dialogs.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (2 diffs)
• notificationcenter/UINotificationObjects.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -52 +52 @@
 #include "UIModalWindowManager.h"
 #include "UINetworkManager.h"
+#include "UINotificationCenter.h"
 #include "UIQObjectStuff.h"
 #include "UISettingsDialogSpecific.h"
@@ -1150 +1151 @@
     AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
 
-    /* Open a session thru which we will modify the machine: */
-    CSession comSession = uiCommon().openSession(pItem->id(), KLockType_Write);
-    if (comSession.isNull())
-        return;
-
-    /* Get session machine: */
-    CMachine comMachine = comSession.GetMachine();
-    AssertMsgReturnVoid(comSession.isOk() && comMachine.isNotNull(), ("Unable to acquire machine!\n"));
-
     /* Open a file dialog for the user to select a destination folder. Start with the default machine folder: */
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    QString strBaseFolder = comVBox.GetSystemProperties().GetDefaultMachineFolder();
-    QString strTitle = tr("Select a destination folder to move the selected virtual machine");
-    QString strDestinationFolder = QIFileDialog::getExistingDirectory(strBaseFolder, this, strTitle);
+    const QString strBaseFolder = uiCommon().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
+    const QString strTitle = tr("Select a destination folder to move the selected virtual machine");
+    const QString strDestinationFolder = QIFileDialog::getExistingDirectory(strBaseFolder, this, strTitle);
     if (!strDestinationFolder.isEmpty())
     {
-        /* Prepare machine move progress: */
-        CProgress comProgress = comMachine.MoveTo(strDestinationFolder, "basic");
-        if (comMachine.isOk() && comProgress.isNotNull())
-        {
-            /* Show machine move progress: */
-            msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_dnd_hg_90px.png");
-            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotMoveMachine(comProgress, comMachine.GetName());
-        }
-        else
-            msgCenter().cannotMoveMachine(comMachine);
-    }
-    comSession.UnlockMachine();
+        /* Move machine: */
+        UINotificationProgressMachineMove *pNotification = new UINotificationProgressMachineMove(pItem->id(),
+                                                                                                 strDestinationFolder,
+                                                                                                 "basic");
+        notificationCenter().append(pNotification);
+    }
 }
 

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QDir>
+#include <QFileInfo>
+
 /* GUI includes: */
+#include "UICommon.h"
 #include "UINotificationObjects.h"
 
@@ -182 +187 @@
     if (m_comTarget.isNotNull() && !m_comTarget.GetId().isNull())
         emit sigMachineCopied(m_comTarget);
+}
+
+
+/*********************************************************************************************************************************
+*   Class UINotificationProgressMachineMove implementation.                                                                      *
+*********************************************************************************************************************************/
+
+UINotificationProgressMachineMove::UINotificationProgressMachineMove(const QUuid &uId,
+                                                                     const QString &strDestination,
+                                                                     const QString &strType)
+    : m_uId(uId)
+    , m_strDestination(QDir::toNativeSeparators(strDestination))
+    , m_strType(strType)
+{
+    connect(this, &UINotificationProgress::sigProgressFinished,
+            this, &UINotificationProgressMachineMove::sltHandleProgressFinished);
+}
+
+QString UINotificationProgressMachineMove::name() const
+{
+    return UINotificationProgress::tr("Moving machine ...");
+}
+
+QString UINotificationProgressMachineMove::details() const
+{
+    return UINotificationProgress::tr("<b>From:</b> %1<br><b>To:</b> %2")
+                                     .arg(m_strSource, m_strDestination);
+}
+
+CProgress UINotificationProgressMachineMove::createProgress(COMResult &comResult)
+{
+    /* Open a session thru which we will modify the machine: */
+    m_comSession = uiCommon().openSession(m_uId, KLockType_Write);
+
+    /* Get session machine: */
+    CMachine comMachine = m_comSession.GetMachine();
+    if (!m_comSession.isOk())
+    {
+        comResult = m_comSession;
+        return CProgress();
+    }
+
+    /* Acquire VM source: */
+    const QString strSettingFilePath = comMachine.GetSettingsFilePath();
+    if (!comMachine.isOk())
+    {
+        comResult = comMachine;
+        return CProgress();
+    }
+    QDir parentDir = QFileInfo(strSettingFilePath).absoluteDir();
+    parentDir.cdUp();
+    m_strSource = QDir::toNativeSeparators(parentDir.absolutePath());
+
+    /* Initialize progress-wrapper: */
+    CProgress comProgress = comMachine.MoveTo(m_strDestination, m_strType);
+    /* Store COM result: */
+    comResult = comMachine;
+    /* Return progress-wrapper: */
+    return comProgress;
+}
+
+void UINotificationProgressMachineMove::sltHandleProgressFinished()
+{
+    /* Unlock session finally: */
+    m_comSession.UnlockMachine();
 }
 

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

@@ -22 +22 @@
 #endif
 
+/* Qt includes: */
+#include <QUuid>
+
 /* GUI includes: */
 #include "UINotificationObject.h"
@@ -34 +37 @@
 #include "CMachine.h"
 #include "CMedium.h"
+#include "CSession.h"
 #include "CVirtualSystemDescription.h"
 
@@ -204 +208 @@
     /** Holds the target machine options. */
     QVector<KCloneOptions>  m_options;
+};
+
+/** UINotificationProgress extension for machine move functionality. */
+class SHARED_LIBRARY_STUFF UINotificationProgressMachineMove : public UINotificationProgress
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs medium move notification-progress.
+      * @param  uId             Brings the machine id.
+      * @param  strDestination  Brings the move destination.
+      * @param  strType         Brings the moving type. */
+    UINotificationProgressMachineMove(const QUuid &uId,
+                                      const QString &strDestination,
+                                      const QString &strType);
+
+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 slots:
+
+    /** Handles signal about progress being finished. */
+    void sltHandleProgressFinished();
+
+private:
+
+    /** Holds the machine id. */
+    QUuid     m_uId;
+    /** Holds the session being opened. */
+    CSession  m_comSession;
+    /** Holds the machine source. */
+    QString   m_strSource;
+    /** Holds the machine destination. */
+    QString   m_strDestination;
+    /** Holds the moving type. */
+    QString   m_strType;
 };