Changeset 100455 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 10, 2023 1:00:06 PM (20 months ago)

Author:

vboxsync

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

158201

Message:

FE/Qt: bugref:9080. bugref:6699. Add a numerical suffix to the new directory name in case there is a collision.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -808 +808 @@
     if (!parentFolderItem)
         return;
-
-    QString newDirectoryName(UICustomFileSystemModel::tr("NewDirectory"));
+    QString strBase(UICustomFileSystemModel::tr("NewDirectory"));
+    QString newDirectoryName(strBase);
+    QStringList nameList = currentDirectoryListing();
+    int iSuffix = 1;
+    while (nameList.contains(newDirectoryName))
+        newDirectoryName = QString("%1_%2").arg(strBase).arg(QString::number(iSuffix++));
 
     if (!createDirectory(parentFolderItem->path(), newDirectoryName))
@@ -1321 +1325 @@
     }
 }
+
+QStringList UIFileManagerTable::currentDirectoryListing() const
+{
+    UICustomFileSystemItem *pItem = static_cast<UICustomFileSystemItem*>(currentRootIndex().internalPointer());
+    if (!pItem)
+        return QStringList();
+    QStringList list;
+    foreach (const UICustomFileSystemItem *pChild, pItem->children())
+    {
+        if (pChild)
+            list << pChild->fileObjectName();
+    }
+    return list;
+}
+
 #include "UIFileManagerTable.moc"

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

@@ -310 +310 @@
       * uses m_searchLineUnmarkColor and m_searchLineMarkColor. */
     void            markUnmarkSearchLineEdit(bool fMark);
-
+    QStringList     currentDirectoryListing() const;
     UICustomFileSystemModel       *m_pModel;
     UIGuestControlFileView        *m_pView;

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

@@ -464 +464 @@
     if (!m_pTableView)
         return;
-    QString strNewDirectoryName("NewDirectory");
+    QString strBaseName("NewDirectory");
+    QString strNewDirectoryName(strBaseName);
+    QStringList currentListing = currentDirectoryListing();
+    int iSuffix = 1;
+    while (currentListing.contains(strNewDirectoryName))
+        strNewDirectoryName = QString("%1_%2").arg(strBaseName).arg(QString::number(iSuffix++));
 
     QModelIndex parentIndex = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
@@ -1114 +1119 @@
     }
 }
+
+const UICustomFileSystemItem* UIVisoContentBrowser::currentDirectoryItem() const
+{
+    if (!m_pTableView || !m_pTableView->rootIndex().isValid())
+        return 0;
+    QModelIndex currentRoot = m_pTableProxyModel->mapToSource(m_pTableView->rootIndex());
+
+    return static_cast<UICustomFileSystemItem*>(currentRoot.internalPointer());
+}
+
+QStringList UIVisoContentBrowser::currentDirectoryListing() const
+{
+    const UICustomFileSystemItem *pCurrentDirectoryItem = currentDirectoryItem();
+    if (!pCurrentDirectoryItem)
+        return QStringList();
+    QStringList nameList;
+    foreach (const UICustomFileSystemItem *pChild, pCurrentDirectoryItem->children())
+    {
+        if (pChild)
+            nameList << pChild->fileObjectName();
+    }
+    return nameList;
+}
+
 #include "UIVisoContentBrowser.moc"

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

@@ -135 +135 @@
      *  in the table view. */
     QList<UICustomFileSystemItem*> tableSelectedItems();
+    /* Names of the file objects of the current directory. */
+    QStringList                    currentDirectoryListing() const;
     bool                           onStartItem();
     void                           goUp();
     void                           createLoadedFileEntries(const QMap<QString, QString> &fileEntries);
+    const UICustomFileSystemItem*  currentDirectoryItem() const;
     UIVisoContentTableView        *m_pTableView;
     UICustomFileSystemModel       *m_pModel;