Changeset 71208 in vbox

Timestamp:

Mar 5, 2018 5:39:39 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:6699 Implement guest 'delete' actions for file table widget

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (3 diffs)
• UIGuestControlFileTable.cpp (modified) (10 diffs)
• UIGuestControlFileTable.h (modified) (5 diffs)

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

@@ -424 +424 @@
     {
         m_pLogOutput->appendPlainText("Guest session is not valid");
+        postSessionClosed();
         return;
     }
@@ -439 +440 @@
 void UIGuestControlFileManager::sltGuestSessionStateChanged(const CGuestSessionStateChangedEvent &cEvent)
 {
-    if (cEvent.isOk() && m_comGuestSession.isOk())// && m_comGuestProcess.GetStatus() == KProcessStatus_Error)
+    if (cEvent.isOk() && m_comGuestSession.isOk())
     {
         CVirtualBoxErrorInfo cErrorInfo = cEvent.GetError();
-        if (cErrorInfo.isOk())// && cErrorInfo.GetResultCode() != S_OK)
+        if (cErrorInfo.isOk())
         {
             m_pLogOutput->appendPlainText(cErrorInfo.GetText());
@@ -520 +521 @@
     connect(m_pQtSessionListener->getWrapped(), &UIMainEventListener::sigGuestSessionStatedChanged,
             this, &UIGuestControlFileManager::sltGuestSessionStateChanged);
-    // /* Wait session to start: */
-    // const ULONG waitTimeout = 2000;
-    // KGuestSessionWaitResult waitResult = guestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout);
-    // if (waitResult != KGuestSessionWaitResult_Start)
-    //     return false;
-
-    // outSession = guestSession;
+     /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event
+        consistently. So we wait: */
+    m_pLogOutput->appendPlainText("Waiting the session to start");
+    const ULONG waitTimeout = 2000;
+    KGuestSessionWaitResult waitResult = m_comGuestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout);
+    if (waitResult != KGuestSessionWaitResult_Start)
+    {
+        m_pLogOutput->appendPlainText("The session did not start");
+        sltCloseSession();
+        return false;
+    }
 
     return true;

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

@@ -38 +38 @@
 # include "CFsObjInfo.h"
 # include "CGuestDirectory.h"
+# include "CProgress.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -477 +478 @@
 
     m_pDelete = new QAction(this);
-    m_pDelete->setIcon(UIIconPool::iconSet(QString(":/vm_delete_32px.png")));
-    m_pToolBar->addAction(m_pDelete);
+    if (m_pDelete)
+    {
+        connect(m_pDelete, &QAction::triggered, this, &UIGuestControlFileTable::sltDelete);
+        m_pDelete->setIcon(UIIconPool::iconSet(QString(":/vm_delete_32px.png")));
+        m_pToolBar->addAction(m_pDelete);
+    }
 
     m_pNewFolder = new QAction(this);
@@ -612 +617 @@
 void UIGuestControlFileTable::sltRefresh()
 {
+    refresh();
+}
+
+void UIGuestControlFileTable::refresh()
+{
     if (!m_pView || !m_pModel)
         return;
@@ -621 +631 @@
     if (!treeItem)
         return;
+    bool isRootDir = (m_pModel->rootIndex() == currentIndex);
     m_pModel->beginReset();
     /* For now we clear the whole subtree (that isrecursively) which is an overkill: */
     treeItem->clearChildren();
-    readDirectory(treeItem->path(), treeItem, false);
+    readDirectory(treeItem->path(), treeItem, isRootDir);
     m_pModel->endReset();
     m_pView->setRootIndex(currentIndex);
 }
 
+void UIGuestControlFileTable::sltDelete()
+{
+    if (!m_pView || !m_pModel)
+        return;
+    QItemSelectionModel *selectionModel =  m_pView->selectionModel();
+    if (!selectionModel)
+        return;
+
+    QModelIndexList selectedItemIndices = selectionModel->selectedIndexes();
+    for(int i = 0; i < selectedItemIndices.size(); ++i)
+    {
+        deleteByIndex(selectedItemIndices.at(i));
+    }
+    refresh();
+}
+
+void UIGuestControlFileTable::deleteByIndex(const QModelIndex &itemIndex)
+{
+    if (!itemIndex.isValid())
+        return;
+    UIFileTableItem *treeItem = static_cast<UIFileTableItem*>(itemIndex.internalPointer());
+    if (!treeItem)
+        return;
+    deleteByItem(treeItem);
+}
 
 void UIGuestControlFileTable::retranslateUi()
@@ -641 +677 @@
     {
         m_pDelete->setText(UIVMInformationDialog::tr("Delete"));
-        m_pDelete->setToolTip(UIVMInformationDialog::tr("Delete the selected item"));
-        m_pDelete->setStatusTip(UIVMInformationDialog::tr("Delete the selected item"));
+        m_pDelete->setToolTip(UIVMInformationDialog::tr("Delete the selected item(s)"));
+        m_pDelete->setStatusTip(UIVMInformationDialog::tr("Delete the selected item(s)"));
     }
 
@@ -663 +699 @@
     {
         m_pCopy->setText(UIVMInformationDialog::tr("Copy the selected item"));
-        m_pCopy->setToolTip(UIVMInformationDialog::tr("Copy the selected item"));
-        m_pCopy->setStatusTip(UIVMInformationDialog::tr("Copy the selected item"));
+        m_pCopy->setToolTip(UIVMInformationDialog::tr("Copy the selected item(s)"));
+        m_pCopy->setStatusTip(UIVMInformationDialog::tr("Copy the selected item(s)"));
 
     }
@@ -670 +706 @@
     if (m_pCut)
     {
-        m_pCut->setText(UIVMInformationDialog::tr("Cut the selected item"));
-        m_pCut->setToolTip(UIVMInformationDialog::tr("Cut the selected item"));
-        m_pCut->setStatusTip(UIVMInformationDialog::tr("Cut the selected item"));
+        m_pCut->setText(UIVMInformationDialog::tr("Cut the selected item(s)"));
+        m_pCut->setToolTip(UIVMInformationDialog::tr("Cut the selected item(s)"));
+        m_pCut->setStatusTip(UIVMInformationDialog::tr("Cut the selected item(s)"));
 
     }
@@ -678 +714 @@
     if ( m_pPaste)
     {
-        m_pPaste->setText(UIVMInformationDialog::tr("Paste the copied item"));
-        m_pPaste->setToolTip(UIVMInformationDialog::tr("Paste the copied item"));
-        m_pPaste->setStatusTip(UIVMInformationDialog::tr("Paste the copied item"));
+        m_pPaste->setText(UIVMInformationDialog::tr("Paste the copied item(s)"));
+        m_pPaste->setToolTip(UIVMInformationDialog::tr("Paste the copied item(s)"));
+        m_pPaste->setStatusTip(UIVMInformationDialog::tr("Paste the copied item(s)"));
     }
 
@@ -761 +797 @@
 }
 
-void UIGuestFileTable::refresh()
-{
-}
-
+void UIGuestFileTable::deleteByItem(UIFileTableItem *item)
+{
+    if (!item)
+        return;
+    if (!m_comGuestSession.isOk())
+        return;
+    if (item->isUpDirectory())
+        return;
+    QVector<KDirectoryRemoveRecFlag> flags(KDirectoryRemoveRecFlag_ContentAndDir);
+
+    if (item->isDirectory())
+    {
+        m_comGuestSession.DirectoryRemoveRecursive(item->path(), flags);
+    }
+    else
+    {
+        m_comGuestSession.FsObjRemove(item->path());
+    }
+}
 
 /*********************************************************************************************************************************
@@ -825 +876 @@
 }
 
-void UIHostFileTable::refresh()
-{
+void UIHostFileTable::deleteByItem(UIFileTableItem */*item */)
+{
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/guestctrl/UIGuestControlFileTable.h

@@ -100 +100 @@
                            bool isDirectoryMap, bool isStartDir);
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) = 0;
-    virtual void refresh() = 0;
+    virtual void refresh();
+    virtual void deleteByItem(UIFileTableItem *item) = 0;
     UIFileTableItem         *m_pRootItem;
 
@@ -116 +117 @@
     void sltGoUp();
     void sltRefresh();
+    void sltDelete();
 
 private:
@@ -121 +123 @@
     void            prepareObjects();
     void            prepareActions();
+    void            deleteByIndex(const QModelIndex &itemIndex);
     QGridLayout    *m_pMainLayout;
     QILineEdit     *m_pCurrentLocationEdit;
@@ -150 +153 @@
     void retranslateUi() /* override */;
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
-    virtual void refresh() /* override */;
+    virtual void deleteByItem(UIFileTableItem *item) /* override */;
 
 private:
@@ -171 +174 @@
     void retranslateUi() /* override */;
     virtual void readDirectory(const QString& strPath, UIFileTableItem *parent, bool isStartDir = false) /* override */;
-    virtual void refresh() /* override */;
-
+    virtual void deleteByItem(UIFileTableItem *item) /* override */;
 };