Changeset 75619 in vbox

Timestamp:

Nov 20, 2018 1:05:41 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. scm fix

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (3 diffs)
• UIGuestControlFileManager.h (modified) (1 diff)
• UIGuestControlFileTable.cpp (modified) (1 diff)
• UIHostFileTable.cpp (modified) (1 diff)
• UIHostFileTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.cpp

@@ -251 +251 @@
             connect(m_pGuestFileTable, &UIGuestFileTable::sigNewFileOperation,
                     this, &UIGuestControlFileManager::sltReceieveNewFileOperation);
+            connect(m_pGuestFileTable, &UIGuestFileTable::sigCacheHostFileObjectsForDeletion,
+                    this, &UIGuestControlFileManager::sltCacheHostFileObjectsForDeletion);
 
             pFileTableContainerLayout->addWidget(m_pGuestFileTable);
@@ -335 +337 @@
     connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_CopyToGuest), &QAction::triggered,
              this, &UIGuestControlFileManager::sltCopyHostToGuest);
+
+    connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToHost), &QAction::triggered,
+            this, &UIGuestControlFileManager::sltMoveGuestToHost);
+    connect(m_pActionPool->action(UIActionIndex_M_GuestControlFileManager_S_MoveToGuest), &QAction::triggered,
+             this, &UIGuestControlFileManager::sltMoveHostToGuest);
 
     layout ->addWidget(m_pToolBar);
@@ -522 +529 @@
 void UIGuestControlFileManager::sltFileOperationComplete(QUuid progressId)
 {
-    if (m_pGuestFileTable)
-    {
-        m_pGuestFileTable->refresh();
-        /* The following call deletes file objects whose paths have been cached for later deletion: */
-        m_pGuestFileTable->continueWithMove(progressId);
-    }
-
+    if (!m_pGuestFileTable || !m_pHostFileTable)
+        return;
+
+    /* The following call deletes file objects whose paths have been cached for later deletion: */
+    m_pGuestFileTable->continueWithMove(progressId);
+    m_pHostFileTable->continueWithMove(progressId);
+
+    m_pHostFileTable->refresh();
+    m_pGuestFileTable->refresh();
+}
+
+void UIGuestControlFileManager::sltCacheHostFileObjectsForDeletion(const QUuid &moveProgessId,
+                                                                   const QStringList &hostPathList)
+{
     if (m_pHostFileTable)
-    {
-        m_pHostFileTable->refresh();
-    }
+        m_pHostFileTable->updateDeleteAfterCopyCache(moveProgessId, hostPathList);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileManager.h

@@ -116 +116 @@
     void sltReceieveNewFileOperation(const CProgress &comProgress);
     void sltFileOperationComplete(QUuid progressId);
+    void sltCacheHostFileObjectsForDeletion(const QUuid &moveProgessId, const QStringList &hostPathList);
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlFileTable.cpp

@@ -1362 +1362 @@
 void UIGuestControlFileTable::continueWithMove(const QUuid &progressId)
 {
-    QStringList sourcePathList = m_deleteAfterCopyCache.value(progressId);
     deleteByPath(m_deleteAfterCopyCache.value(progressId, QStringList()));
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp

@@ -134 +134 @@
 }
 
-void UIHostFileTable::setDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList)
+void UIHostFileTable::updateDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList)
 {
     m_deleteAfterCopyCache[progressId] = sourceObjectsList;

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.h

@@ -34 +34 @@
 
     UIHostFileTable(UIActionPool *pActionPool, QWidget *pParent = 0);
-    void setDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList);
+    void updateDeleteAfterCopyCache(const QUuid &progressId, const QStringList &sourceObjectsList);
 
 protected: