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

Timestamp:

Apr 12, 2018 3:39:09 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Teach file manager to list host drive letters

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl

Files:

• UIGuestControlFileTable.cpp (modified) (4 diffs)
• UIGuestControlFileTable.h (modified) (1 diff)
• UIHostFileTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

@@ -1008 +1008 @@
     if (m_pRootItem)
         reset();
-    determineDriveLetters();
+
     /* Root item: */
     const QString startPath("/");
@@ -1021 +1021 @@
     m_pRootItem->appendChild(startItem);
     startItem->setIsOpened(false);
+    populateStartDirectory(startItem);
+    m_pView->setRootIndex(m_pModel->rootIndex());
+    m_pModel->signalUpdate();
+    updateCurrentLocationEdit(startPath);
+}
+
+void UIGuestControlFileTable::populateStartDirectory(UIFileTableItem *startItem)
+{
+    determineDriveLetters();
     if (m_driveLetterList.isEmpty())
     {
         /* Read the root directory and get the list: */
-        readDirectory(startPath, startItem, true);
+        readDirectory(startItem->path(), startItem, true);
     }
     else
@@ -1041 +1050 @@
         }
     }
-    m_pView->setRootIndex(m_pModel->rootIndex());
-    m_pModel->signalUpdate();
-    updateCurrentLocationEdit(startPath);
+
 }
 
@@ -1192 +1199 @@
     /* For now we clear the whole subtree (that isrecursively) which is an overkill: */
     treeItem->clearChildren();
-    readDirectory(treeItem->path(), treeItem, isRootDir);
+    if (isRootDir)
+        populateStartDirectory(treeItem);
+    else
+        readDirectory(treeItem->path(), treeItem, isRootDir);
     m_pModel->endReset();
     m_pView->setRootIndex(currentIndex);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.h

@@ -336 +336 @@
     void            deSelectUpDirectoryItem();
     void            setSelectionForAll(QItemSelectionModel::SelectionFlags flags);
+    /** Start directory requires a special attention since on file systems with drive letters
+     *  drive letter are direct children of the start directory. On other systems start directory is '/' */
+    void            populateStartDirectory(UIFileTableItem *startItem);
     QGridLayout     *m_pMainLayout;
     QComboBox       *m_pLocationComboBox;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -383 +383 @@
 void UIHostFileTable::determineDriveLetters()
 {
+    //#ifdef VBOX_WS_WIN
+
+    QFileInfoList drive = QDir::drives();
+
+    for (int i = 0; i < drive.size(); ++i)
+    {
+        m_driveLetterList.push_back(drive[i].filePath());
+
+    }
+    //#endif
 }