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

Timestamp:

Jan 3, 2019 2:40:48 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: 6699: Manage tree item path correctly

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (1 diff)
• globals/UICustomFileSystemModel.h (modified) (6 diffs)
• globals/UIPathOperations.h (modified) (1 diff)
• guestctrl/UIFileManagerHostTable.cpp (modified) (1 diff)

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

@@ -162 +162 @@
 }
 
-const QString  &UICustomFileSystemItem::path() const
-{
-    return m_strPath;
+QString  UICustomFileSystemItem::path() const
+{
+    return m_itemData.value(UICustomFileSystemModelColumn_Path, QString()).toString();
 }
 
 void UICustomFileSystemItem::setPath(const QString &path)
 {
-    if (path.isNull() || path.isEmpty())
+    QString strNewPath =     UIPathOperations::removeTrailingDelimiters(path);
+    if (strNewPath.isNull() || strNewPath.isEmpty())
         return;
-    m_strPath = path;
-    UIPathOperations::removeTrailingDelimiters(m_strPath);
+    m_itemData[UICustomFileSystemModelColumn_Path] = strNewPath;
 }
 

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

@@ -26 +26 @@
 #include <QSortFilterProxyModel>
 
+#include "UILibraryDefs.h"
+
 /* COM includes: */
 #include "COMEnums.h"
@@ -43 +45 @@
 /** A UICustomFileSystemItem instance is a tree node representing a file object (file, directory, etc). The tree contructed
     by these instances is the data source for the UICustomFileSystemModel. */
-class UICustomFileSystemItem
+class SHARED_LIBRARY_STUFF UICustomFileSystemItem
 {
 public:
@@ -70 +72 @@
     void setIsOpened(bool flag);
 
-    const QString  &path() const;
+    /** Full absolute path of the item. Without the trailing '/' */
+    QString  path() const;
     void setPath(const QString &path);
 
@@ -104 +107 @@
     UICustomFileSystemItem *m_parentItem;
     bool             m_bIsOpened;
-    /** Full absolute path of the item. Without the trailing '/' */
-    QString          m_strPath;
     /** If this is a symlink m_targetPath keeps the absolute path of the target */
     QString          m_strTargetPath;
@@ -117 +118 @@
 /** A QSortFilterProxyModel extension used in file tables. Modifies some
  *  of the base class behavior like lessThan(..) */
-class UICustomFileSystemProxyModel : public QSortFilterProxyModel
+class SHARED_LIBRARY_STUFF UICustomFileSystemProxyModel : public QSortFilterProxyModel
 {
 
@@ -140 +141 @@
  *  it supports a tree level hierarchy which can be displayed with
  *  QTableView and/or QTreeView.*/
-class UICustomFileSystemModel : public QAbstractItemModel
+class SHARED_LIBRARY_STUFF UICustomFileSystemModel : public QAbstractItemModel
 {
 

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

@@ -25 +25 @@
 #include <QString>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
 
 /** A collection of simple utility functions to manipulate path strings */
-class UIPathOperations
+class SHARED_LIBRARY_STUFF UIPathOperations
 {
 public:

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

@@ -141 +141 @@
     if (!directory.exists())
         return;
-    QFileInfoList entries = directory.entryInfoList();
+    QFileInfoList entries = directory.entryInfoList(QDir::Hidden|QDir::AllEntries|QDir::NoDotAndDotDot);
     for (int i = 0; i < entries.size(); ++i)
     {
         const QFileInfo &fileInfo = entries.at(i);
-
-        if (fileInfo.fileName() == ".")
-            continue;
-        if (fileInfo.fileName() == "..")
-            continue;
 
         UICustomFileSystemItem *item = new UICustomFileSystemItem(fileInfo.fileName(), parent, fileType(fileInfo));