Changeset 76690 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 7, 2019 7:58:10 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080: Handle added items better

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• globals/UICustomFileSystemModel.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• medium/viso/UIVisoContentBrowser.cpp (modified) (6 diffs)
• medium/viso/UIVisoContentBrowser.h (modified) (5 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.h (modified) (1 diff)

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

@@ -541 +541 @@
     if (!rootItem())
         return QModelIndex();
+    if (!rootItem()->child(0))
+        return QModelIndex();
     return createIndex(rootItem()->child(0)->row(), 0,
                        rootItem()->child(0));

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

@@ -50 +50 @@
 
     /** @p strName contains file object name which is assumed to be unique among a parent object's children. */
-    explicit UICustomFileSystemItem(const QString &strName, UICustomFileSystemItem *parentItem, KFsObjType type);
-    ~UICustomFileSystemItem();
+    UICustomFileSystemItem(const QString &strName, UICustomFileSystemItem *parentItem, KFsObjType type);
+    virtual ~UICustomFileSystemItem();
 
     void reset();
-    UICustomFileSystemItem *child(int row) const;
+    virtual UICustomFileSystemItem *child(int row) const;
     /** Searches for the child by path and returns it if found. */
     UICustomFileSystemItem *child(const QString &path) const;

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

@@ -2724 +2724 @@
     if (pVisoCreator->execute(true, false))
     {
-        QStringList files = pVisoCreator->pathList();
+        QStringList files = pVisoCreator->entryList();
         if (files.empty() || files[0].isEmpty())
             return QUuid();

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

@@ -127 +127 @@
 
         UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(fileInfo.fileName(), pParentItem,
-                                                                       fileType(fileInfo));
+                                                                        fileType(fileInfo));
         pAddedItem->setData(strPath, UICustomFileSystemModelColumn_LocalPath);
         pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), fileInfo.fileName()),
@@ -137 +137 @@
             pAddedItem->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         }
-
+        m_entryList << createAnIsoEntry(pAddedItem);
     }
     if (m_pTableProxyModel)
@@ -148 +148 @@
 }
 
-QStringList UIVisoContentBrowser::pathList()
-{
-    if (!rootItem())
-        return QStringList();
-
-    UICustomFileSystemItem *pRoot = rootItem()->child(0);
-
-    if (!pRoot)
-        return QStringList();
-
-    QStringList pathList;
-    for (int i = 0; i < pRoot->childCount(); ++i)
-    {
-        QString strEntry = QString("%1=%2").arg(pRoot->child(i)->data(UICustomFileSystemModelColumn_Path).toString()).
-            arg(pRoot->child(i)->data(UICustomFileSystemModelColumn_LocalPath).toString());
-        pathList << strEntry;
-    }
-    return pathList;
-}
-
+QString UIVisoContentBrowser::createAnIsoEntry(UICustomFileSystemItem *pItem)
+{
+    QString strEntry;
+    if (!pItem)
+        return strEntry;
+    if (pItem->data(UICustomFileSystemModelColumn_Path).toString().isEmpty() ||
+        pItem->data(UICustomFileSystemModelColumn_LocalPath).toString().isEmpty())
+        return strEntry;
+    strEntry = QString("%1=%2").arg(pItem->data(UICustomFileSystemModelColumn_Path).toString()).
+        arg(pItem->data(UICustomFileSystemModelColumn_LocalPath).toString());
+    return strEntry;
+}
+
+QStringList UIVisoContentBrowser::entryList()
+{
+    return m_entryList;
+}
 
 void UIVisoContentBrowser::retranslateUi()
@@ -240 +237 @@
     UICustomFileSystemItem* pAddedItem = new UICustomFileSystemItem(strNewDirectoryName, pParentItem,
                                                                     KFsObjType_Directory);
+    pAddedItem->setData(UIPathOperations::mergePaths(pParentItem->path(), strNewDirectoryName), UICustomFileSystemModelColumn_Path);
 
     pAddedItem->setIsOpened(false);
@@ -482 +480 @@
             UICustomFileSystemItem *newItem = new UICustomFileSystemItem(fileInfo.fileName(),
                                                                          directoryItem,
-                                                                         fileType(fileInfo));
+                                                                       fileType(fileInfo));
             newItem->setData(fileInfo.filePath(), UICustomFileSystemModelColumn_LocalPath);
 
@@ -547 +545 @@
     }
 
+    pItem->setData(UIPathOperations::mergePaths(pItem->parentItem()->path(), pItem->name()), UICustomFileSystemModelColumn_Path);
+
+
+
     if (m_pTableProxyModel)
         m_pTableProxyModel->invalidate();
 }
 
+void UIVisoContentBrowser::reset()
+{
+    m_entryList.clear();
+}
 #include "UIVisoContentBrowser.moc"

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

@@ -38 +38 @@
 
 /* Forward declarations: */
+class UICustomFileSystemItem;
 class UICustomFileSystemModel;
-class UICustomFileSystemItem;
 class UICustomFileSystemProxyModel;
 class UIVisoContentTreeProxyModel;
+class UICustomFileSystemItem;
 
 class SHARED_LIBRARY_STUFF UIVisoContentBrowser : public QIWithRetranslateUI<UIVisoBrowserBase>
@@ -53 +54 @@
     /** Adds file objests from the host file system. @p pathList consists of list of paths to there objects. */
     void addObjectsToViso(QStringList pathList);
-    QStringList pathList();
+    QStringList entryList();
     virtual void showHideHiddenObjects(bool bShow) /* override */;
 
@@ -82 +83 @@
     void                    prepareConnections();
     void                    initializeModel();
-    UICustomFileSystemItem* rootItem();
+    UICustomFileSystemItem *rootItem();
     QModelIndex             convertIndexToTableIndex(const QModelIndex &index);
     QModelIndex             convertIndexToTreeIndex(const QModelIndex &index);
@@ -89 +90 @@
     void                    updateStartItemName();
     void                    renameFileObject(UICustomFileSystemItem *pItem);
+    QString                 createAnIsoEntry(UICustomFileSystemItem *pItem);
+    void                    reset();
 
     UICustomFileSystemModel      *m_pModel;
@@ -95 +98 @@
     QIToolButton                 *m_pNewDirectoryButton;
     QString                       m_strVisoName;
+    QStringList                   m_entryList;
 };
 

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

@@ -52 +52 @@
 }
 
-QStringList UIVisoCreator::pathList()
+QStringList UIVisoCreator::entryList()
 {
     if (!m_pVisoBrowser)
         return QStringList();
-    return m_pVisoBrowser->pathList();
+    return m_pVisoBrowser->entryList();
 }
 

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

@@ -53 +53 @@
     UIVisoCreator(QWidget *pParent = 0);
     ~UIVisoCreator();
-    QStringList pathList();
+    QStringList entryList();
 
 #ifdef VBOX_WS_MAC