Changeset 100418 in vbox

Timestamp:

Jul 6, 2023 5:26:08 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. bugref:6699. Update tree item's children map after a rename.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (3 diffs)
• globals/UICustomFileSystemModel.h (modified) (2 diffs)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)
• guestctrl/UIFileManagerHostTable.cpp (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (4 diffs)
• medium/viso/UIVisoContentBrowser.cpp (modified) (1 diff)

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

@@ -77 +77 @@
 }
 
+void UICustomFileSystemItem::childRenamed()
+{
+    /* Recreate child map to accomadate the new file object name of the children: */
+    m_childMap.clear();
+    foreach(UICustomFileSystemItem* pItem, m_childItems)
+        m_childMap[pItem->fileObjectName()] = pItem;
+}
+
 void UICustomFileSystemItem::reset()
 {
@@ -150 +158 @@
 void UICustomFileSystemItem::setData(const QVariant &data, int index)
 {
+    if (m_itemData[static_cast<UICustomFileSystemModelData>(index)] == data)
+        return;
     m_itemData[static_cast<UICustomFileSystemModelData>(index)] = data;
+    if (static_cast<UICustomFileSystemModelData>(index) == UICustomFileSystemModelData_Name && parentItem())
+        parentItem()->childRenamed();
 }
 
@@ -220 +232 @@
 
     return UIPathOperations::removeMultipleDelimiters(path.join("/"));
-}
-
-void UICustomFileSystemItem::setPath(const QString &path)
-{
-    if (path.isNull() || path.isEmpty())
-        return;
-    m_itemData[UICustomFileSystemModelData_VISOPath] = path;
 }
 

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

@@ -90 +90 @@
     /** Full absolute path of the item. With or without the trailing '/' */
     QString  path(bool fRemoveTrailingDelimiters = false) const;
-    void setPath(const QString &path);
 
     /** Returns true if this is directory and file object name is ".." */
@@ -118 +117 @@
 
 private:
+
     void appendChild(UICustomFileSystemItem *child);
-
+    void childRenamed();
     QList<UICustomFileSystemItem*>         m_childItems;
     /** Used to find children by file object name */

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

@@ -569 +569 @@
                     item->setData(fsInfo.GetUserName(), UICustomFileSystemModelData_Owner);
                     item->setData(permissionString(fsInfo), UICustomFileSystemModelData_Permissions);
-                    item->setPath(UIPathOperations::removeTrailingDelimiters(UIPathOperations::mergePaths(strPath, fsInfo.GetName())));
                     item->setIsOpened(false);
                     item->setIsHidden(isFileObjectHidden(fsInfo));

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

@@ -166 +166 @@
         item->setData(fileInfo.owner(),        UICustomFileSystemModelData_Owner);
         item->setData(permissionString(fileInfo.permissions()),  UICustomFileSystemModelData_Permissions);
-        item->setPath(fileInfo.absoluteFilePath());
+
         /* if the item is a symlink set the target path and
            check the target if it is a directory: */

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

@@ -520 +520 @@
 {
     if (m_pNavigationWidget)
-    {
         m_pNavigationWidget->setPath(strLocation);
-    }
 }
 
@@ -553 +551 @@
     const QString startPath("/");
     UICustomFileSystemItem* startItem = new UICustomFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
-    startItem->setPath(startPath);
+
     startItem->setIsOpened(false);
     populateStartDirectory(startItem);
@@ -576 +574 @@
             UICustomFileSystemItem* driveItem = new UICustomFileSystemItem(UIPathOperations::removeTrailingDelimiters(m_driveLetterList[i]),
                                                                            startItem, KFsObjType_Directory);
-            driveItem->setPath(m_driveLetterList[i]);
             driveItem->setIsOpened(false);
             driveItem->setIsDriveItem(true);
@@ -702 +699 @@
         /* search the current path item among the parent's children: */
         UICustomFileSystemItem *item = parent->child(pathTrail.at(i));
+
         if (!item)
             return;

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

@@ -718 +718 @@
 
     UICustomFileSystemItem *pStartItem = new UICustomFileSystemItem(startPath, rootItem(), KFsObjType_Directory);
-    pStartItem->setPath("/");
+
     pStartItem->setIsOpened(false);
 }