Changeset 102446 in vbox

Timestamp:

Dec 4, 2023 1:04:00 PM (16 months ago)

Author:

vboxsync

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

160589

Message:

FE/Qt: bugref:10561. Delete removed ISO file objects rather than marking them.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (2 diffs)
• globals/UICustomFileSystemModel.h (modified) (2 diffs)
• guestctrl/UIFileManagerTable.cpp (modified) (1 diff)
• guestctrl/UIFileManagerTable.h (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)

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

@@ -30 +30 @@
 #include <QDateTime>
 #include <QHeaderView>
+#include <QIODevice>
+#include <QMimeData>
 
 /* GUI includes: */
@@ -422 +424 @@
     m_pRootItem = new UICustomFileSystemItem(QString(), 0, KFsObjType_Directory);
     m_pRootItem->setParentModel(this);
+}
+
+QStringList UICustomFileSystemModel::mimeTypes() const
+{
+    QStringList types;
+    types << "application/vnd.text.list";
+    return types;
+}
+
+QMimeData *UICustomFileSystemModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    foreach (const QModelIndex &index, indexes) {
+        if (index.isValid() && index.column() == 0)
+        {
+            UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>(index.internalPointer());
+            if (!pItem)
+                continue;
+
+            QString strPath = pItem->path();
+            if (!strPath.contains(".."))
+                stream << strPath;
+        }
+    }
+
+    mimeData->setData("application/vnd.text.list", encodedData);
+    return mimeData;
 }
 

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

@@ -41 +41 @@
 #include "COMEnums.h"
 
+class QMimeData;
 class UICustomFileSystemModel;
 
@@ -224 +225 @@
     bool isWindowsFileSystem() const;
 
+    virtual QStringList mimeTypes() const RT_OVERRIDE;
+    /** Prepares the mime data  as a list of text consisting of dragged objects full file path. */
+    QMimeData *mimeData(const QModelIndexList &indexes) const RT_OVERRIDE;
+
     static const char* strUpDirectoryString;
 

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

@@ -1227 +1227 @@
 }
 
+void UIFileManagerTable::setDragDropMode(QAbstractItemView::DragDropMode behavior)
+{
+    if (m_pView)
+        m_pView->setDragDropMode(behavior);
+}
+
 void UIFileManagerTable::sltReceiveDirectoryStatistics(UIDirectoryStatistics statistics)
 {

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

@@ -165 +165 @@
     void optionsUpdated();
     bool hasSelection() const;
+    void setDragDropMode(QAbstractItemView::DragDropMode behavior);
 
 public slots:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoContentBrowser.cpp

@@ -516 +516 @@
 void UIVisoContentBrowser::removeItems(const QList<UICustomFileSystemItem*> itemList)
 {
+    AssertReturnVoid(m_pModel);
+    AssertReturnVoid(m_pTableProxyModel);
     foreach(UICustomFileSystemItem *pItem, itemList)
     {
@@ -531 +533 @@
 
         markRemovedUnremovedItemParents(pItem, true);
-    }
-    if (m_pTableProxyModel)
-        m_pTableProxyModel->invalidate();
+        m_pModel->deleteItem(pItem);
+    }
+
+    m_pTableProxyModel->invalidate();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -492 +492 @@
     pContainerLayout->addWidget(m_pHostFileBrowser, 0, 0, 1, 4);
     m_pHostFileBrowser->setModifierActionsVisible(false);
+    m_pHostFileBrowser->setDragDropMode(QAbstractItemView::DragOnly);
 
     prepareVerticalToolBar();