Changeset 100460 in vbox for trunk

Timestamp:

Jul 10, 2023 2:08:18 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Don't store viso path in data field as it is redundant.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -650 +650 @@
     m_pRootItem->setData(UICustomFileSystemModel::tr("Permissions"), UICustomFileSystemModelData_Permissions);
     m_pRootItem->setData(UICustomFileSystemModel::tr("Local Path"), UICustomFileSystemModelData_LocalPath);
-    m_pRootItem->setData(UICustomFileSystemModel::tr("Path"), UICustomFileSystemModelData_VISOPath);
-}
+}

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

@@ -48 +48 @@
     UICustomFileSystemModelData_Owner,
     UICustomFileSystemModelData_Permissions,
-    UICustomFileSystemModelData_VISOPath,
     UICustomFileSystemModelData_LocalPath,
     UICustomFileSystemModelData_ISOFilePath, /* in case of import-iso this contains full path of the container iso file. */

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

@@ -496 +496 @@
         connect(m_pView, &UIGuestControlFileView::customContextMenuRequested,
                 this, &UIFileManagerTable::sltCreateFileViewContextMenu);
-        m_pView->hideColumn(UICustomFileSystemModelData_VISOPath);
         m_pView->hideColumn(UICustomFileSystemModelData_LocalPath);
         m_sessionWidgets << m_pView;

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

@@ -307 +307 @@
         UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(fileInfo.fileName(), pParentItem,
                                                                         objectList[i].enmObjectType);
-        /* VISOPAth and LocalPath is the same since we allow importing ISO content only to VISO root:*/
+
         QString path = UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName());
         pAddedItem->setData(path, UICustomFileSystemModelData_LocalPath);
         pAddedItem->setData(strISOFilePath, UICustomFileSystemModelData_ISOFilePath);
-        pAddedItem->setData(path, UICustomFileSystemModelData_VISOPath);
         pAddedItem->setIsOpened(false);
         // if (fileInfo.isSymLink())
@@ -375 +374 @@
                                                                         fileType(fileInfo));
         pAddedItem->setData(strPath, UICustomFileSystemModelData_LocalPath);
-        pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName()),
-                           UICustomFileSystemModelData_VISOPath);
+
         pAddedItem->setIsOpened(false);
         if (fileInfo.isSymLink())
@@ -393 +391 @@
     if (!pItem)
         return;
-    if (pItem->data(UICustomFileSystemModelData_VISOPath).toString().isEmpty())
+    if (pItem->path().isEmpty())
         return;
 
@@ -400 +398 @@
         return;
     if (!bRemove)
-        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_VISOPath).toString(),
+        m_entryMap.insert(pItem->path(),
                           pItem->data(UICustomFileSystemModelData_LocalPath).toString());
     else
-        m_entryMap.insert(pItem->data(UICustomFileSystemModelData_VISOPath).toString(),
+        m_entryMap.insert(pItem->path(),
                           ":remove:");
 }
@@ -431 +429 @@
         pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Permissions"), UICustomFileSystemModelData_Permissions);
         pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "Local Path"), UICustomFileSystemModelData_LocalPath);
-        pRootItem->setData(QApplication::translate("UIVisoCreatorWidget", "VISO Path"), UICustomFileSystemModelData_VISOPath);
     }
     setFileTableLabelText(QApplication::translate("UIVisoCreatorWidget","VISO Content"));
@@ -490 +487 @@
     UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(strNewDirectoryName, pParentItem,
                                                                     KFsObjType_Directory);
-    pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), strNewDirectoryName), UICustomFileSystemModelData_VISOPath);
 
     pAddedItem->setIsOpened(false);
@@ -510 +506 @@
         if (!pItem)
             continue;
-        QString strIsoPath = pItem->data(UICustomFileSystemModelData_VISOPath).toString();
+        QString strIsoPath = pItem->path();
         if (strIsoPath.isEmpty())
             continue;
@@ -876 +872 @@
                     continue;
 
-                pItem->setData(strPath, UICustomFileSystemModelData_VISOPath);
                 if (i == pathList.size() - 1)
                     pItem->setData(strLocalPath, UICustomFileSystemModelData_LocalPath);
@@ -926 +921 @@
             newItem->setData(fileInfo.filePath(), UICustomFileSystemModelData_LocalPath);
 
-            newItem->setData(UIPathOperations::mergePaths(directoryItem->path(), fileInfo.fileName()),
-                             UICustomFileSystemModelData_VISOPath);
             if (fileInfo.isSymLink())
             {
@@ -983 +976 @@
                                                 const QString &strOldName, const QString &strNewName)
 {
-    Q_UNUSED(strOldPath);
     if (!pItem || !pItem->parentItem())
         return;
@@ -993 +985 @@
             bDuplicate = true;
     }
+
     QString strNewPath = UIPathOperations::mergePaths(pItem->parentItem()->path(), pItem->fileObjectName());
 
@@ -1006 +999 @@
            VISO file for the old path since in some cases, when remaned item is not top level, it still
            appears in ISO. So we remove it explicitly: */
-        QString oldItemPath = pItem->data(UICustomFileSystemModelData_VISOPath).toString();
         m_entryMap.insert(strNewPath, pItem->data(UICustomFileSystemModelData_LocalPath).toString());
-        m_entryMap.remove(oldItemPath);
+        m_entryMap.remove(strOldPath);
         if (!pItem->data(UICustomFileSystemModelData_LocalPath).toString().isEmpty())
-            m_entryMap.insert(oldItemPath, ":remove:");
-    }
-
-    pItem->setData(strNewPath, UICustomFileSystemModelData_VISOPath);
+            m_entryMap.insert(strOldPath, ":remove:");
+    }
 
     if (m_pTableProxyModel)
@@ -1091 +1081 @@
     if (!pItem)
         return QString();
-    return pItem->path();//data(UICustomFileSystemModelData_VISOPath).toString();
+    return pItem->path();
 }