Changeset 102378 in vbox for trunk/src

Timestamp:

Nov 29, 2023 12:06:14 PM (18 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160514

Message:

FE/Qt: bugref:10561. Several fixes in file system model related code to make them work correctly with Windows file system.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICustomFileSystemModel.cpp (modified) (5 diffs)
• globals/UICustomFileSystemModel.h (modified) (6 diffs)
• globals/UIPathOperations.cpp (modified) (1 diff)
• globals/UIPathOperations.h (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (3 diffs)
• guestctrl/UIFileManagerGuestTable.h (modified) (1 diff)
• guestctrl/UIFileManagerHostTable.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerHostTable.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (4 diffs)
• guestctrl/UIFileManagerTable.h (modified) (2 diffs)
• medium/viso/UIVisoCreator.h (modified) (2 diffs)
• widgets/UIFileTableNavigationWidget.cpp (modified) (8 diffs)

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

@@ -62 +62 @@
 
     if (parent)
+    {
         parent->appendChild(this);
+        setParentModel(parent->parentModel());
+    }
 }
 
@@ -207 +210 @@
 QString UICustomFileSystemItem::path(bool fRemoveTrailingDelimiters /* = false */) const
 {
+    const QChar delimiter('/');
     Q_UNUSED(fRemoveTrailingDelimiters);
     const UICustomFileSystemItem *pParent = this;
     QStringList path;
-
     while(pParent && pParent->parentItem())
     {
-        printf("ffff %s %d\n", qPrintable(pParent->fileObjectName()), isDriveItem());
         path.prepend(pParent->fileObjectName());
         pParent = pParent->parentItem();
     }
-
-    return UIPathOperations::removeMultipleDelimiters(path.join("/"));
+    QString strPath = UIPathOperations::removeMultipleDelimiters(path.join(delimiter));
+    if (m_pParentModel && m_pParentModel->isWindowsFileSystem())
+    {
+        if (!strPath.isEmpty() && strPath.at(0) == delimiter)
+            strPath.remove(0, 1);
+    }
+    return UIPathOperations::addTrailingDelimiters(strPath);
 }
 
@@ -300 +307 @@
 }
 
+void UICustomFileSystemItem::setParentModel(UICustomFileSystemModel *pModel)
+{
+    m_pParentModel = pModel;
+}
+
+UICustomFileSystemModel *UICustomFileSystemItem::parentModel()
+{
+    return m_pParentModel;
+}
 
 /*********************************************************************************************************************************
@@ -401 +417 @@
     : QAbstractItemModel(parent)
     , m_fShowHumanReadableSizes(false)
+    , m_fIsWindowFileSystemModel(false)
 {
     m_pRootItem = new UICustomFileSystemItem(QString(), 0, KFsObjType_Directory);
+    m_pRootItem->setParentModel(this);
 }
 
@@ -666 +684 @@
         pParent->removeChild(pItem);
 }
+
+void UICustomFileSystemModel::setIsWindowsFileSystem(bool fIsWindowsFileSystem)
+{
+    m_fIsWindowFileSystemModel = fIsWindowsFileSystem;
+}
+
+bool UICustomFileSystemModel::isWindowsFileSystem() const
+{
+    return m_fIsWindowFileSystemModel;
+}

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

@@ -40 +40 @@
 /* COM includes: */
 #include "COMEnums.h"
+
+class UICustomFileSystemModel;
 
 enum UICustomFileSystemModelData
@@ -127 +129 @@
 
     void appendChild(UICustomFileSystemItem *child);
+    void setParentModel(UICustomFileSystemModel *pModel);
+    UICustomFileSystemModel *parentModel();
+
     QList<UICustomFileSystemItem*>               m_childItems;
     QMap<UICustomFileSystemModelData, QVariant>  m_itemData;
@@ -135 +140 @@
     /** True if this is a symlink and the target is a directory */
     bool             m_fIsTargetADirectory;
-    KFsObjType  m_type;
+    KFsObjType       m_type;
     /** True if only this item represents a DOS style drive letter item */
     bool             m_fIsDriveItem;
@@ -141 +146 @@
     bool             m_fIsHidden;
     QString          m_strToolTip;
+    /** Pointer to the parent model. */
+    UICustomFileSystemModel *m_pParentModel;
+    friend UICustomFileSystemModel;
 };
 
@@ -214 +222 @@
     const UICustomFileSystemItem* rootItem() const;
 
+    void setIsWindowsFileSystem(bool fIsWindowsFileSystem);
+    bool isWindowsFileSystem() const;
+
     static const char* strUpDirectoryString;
 
@@ -220 +231 @@
     UICustomFileSystemItem    *m_pRootItem;
     void setupModelData(const QStringList &lines, UICustomFileSystemItem *parent);
-    bool                m_fShowHumanReadableSizes;
+    bool m_fShowHumanReadableSizes;
+    bool m_fIsWindowFileSystemModel;
 };
 

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

@@ -162 +162 @@
     return true;
 }
+
+/* static */ const QString UIPathOperations::replaceDosDelimeter(const QString &path)
+{
+    QString newPath(path);
+    return newPath.replace(dosDelimiter, delimiter);
+}

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

@@ -61 +61 @@
     /** Tries to determine if the path starts with DOS style drive letters. */
     static bool doesPathStartWithDriveLetter(const QString &path);
-
+    static const QString replaceDosDelimeter(const QString &path);
 };
 

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

@@ -427 +427 @@
     , pszMinimumGuestAdditionVersion("6.1")
 {
+    setModelFileSystem(isWindowsFileSystem());
     if (!m_comMachine.isNull())
         m_strTableName = m_comMachine.GetName();
@@ -432 +433 @@
     prepareGuestSessionPanel();
     prepareActionConnections();
-
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange,
             this, &UIFileManagerGuestTable::sltMachineStateChange);
@@ -1590 +1590 @@
 }
 
-bool UIFileManagerGuestTable::isFileSystemWindows() const
-{
-    if (!m_comGuest.isOk())
+bool UIFileManagerGuestTable::isWindowsFileSystem() const
+{
+    if (!m_comMachine.isOk())
         return false;
-    return m_comGuest.GetOSTypeId().contains("windows", Qt::CaseInsensitive);
+    return m_comMachine.GetOSTypeId().contains("windows", Qt::CaseInsensitive);
 }
 

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

@@ -102 +102 @@
     virtual void  setState();
     virtual void  setSessionDependentWidgetsEnabled();
-    virtual bool  isFileSystemWindows() const override final;
+    virtual bool  isWindowsFileSystem() const override final;
 
 private slots:

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

@@ -136 +136 @@
     :UIFileManagerTable(pActionPool, pParent)
 {
+    setModelFileSystem(isWindowsFileSystem());
     initializeFileTree();
     prepareToolbar();
@@ -261 +262 @@
 }
 
-bool UIFileManagerHostTable::isFileSystemWindows() const
+bool UIFileManagerHostTable::isWindowsFileSystem() const
 {
     return uiCommon().hostOperatingSystem().contains("windows", Qt::CaseInsensitive);

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

@@ -74 +74 @@
     virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) override final;
     virtual void    toggleForwardBackwardActions() override final;
-    virtual bool    isFileSystemWindows() const override final;
+    virtual bool    isWindowsFileSystem() const override final;
     /** @name Copy/Cut host-to-host stuff. Currently not implemented.
      * @{ */

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

@@ -461 +461 @@
     if (!m_pModel)
         return;
+
     connect(m_pModel, &UICustomFileSystemModel::sigItemRenamed,
             this, &UIFileManagerTable::sltHandleItemRenameAttempt);
@@ -552 +553 @@
         return;
 
-    const QString startPath("/");
+    QString startPath("/");
     /* On Unix-like systems startItem represents the root directory. On Windows it is like "my computer" under which
      * drives are listed: */
@@ -561 +562 @@
 
     m_pModel->signalUpdate();
-    updateCurrentLocationEdit(startPath);
     m_pView->setRootIndex(m_pProxyModel->mapFromSource(m_pModel->rootIndex()));
+    updateCurrentLocationEdit(currentDirectoryPath());
 }
 
@@ -1345 +1346 @@
 }
 
+void UIFileManagerTable::setModelFileSystem(bool fIsWindowsFileSystem)
+{
+    if (m_pModel)
+        m_pModel->setIsWindowsFileSystem(fIsWindowsFileSystem);
+}
+
 #include "UIFileManagerTable.moc"

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

@@ -227 +227 @@
     virtual void     toggleForwardBackwardActions() = 0;
     virtual bool     event(QEvent *pEvent) RT_OVERRIDE;
-    virtual bool     isFileSystemWindows() const = 0;
+    virtual bool     isWindowsFileSystem() const = 0;
     /** @name Copy/Cut guest-to-guest (host-to-host) stuff.
      * @{ */
@@ -252 +252 @@
     QHBoxLayout*     toolBarLayout();
     void             setSessionWidgetsEnabled(bool fEnabled);
+    void             setModelFileSystem(bool fIsWindowsFileSystem);
 
     QILabel                 *m_pLocationLabel;

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

@@ -51 +51 @@
 class QIToolBar;
 class UIActionPool;
+class UIFileManagerHostTable;
 class UIVisoHostBrowser;
 class UIVisoContentBrowser;
@@ -152 +153 @@
     /** @} */
 
-    QVBoxLayout          *m_pMainLayout;
-    UIVisoHostBrowser    *m_pHostBrowser;
-    UIVisoContentBrowser *m_pVISOContentBrowser;
+    QVBoxLayout            *m_pMainLayout;
+    UIVisoHostBrowser      *m_pHostBrowser;
+    UIVisoContentBrowser   *m_pVISOContentBrowser;
+    UIFileManagerHostTable *m_pHostFileBrowser;
 
     QIToolBar             *m_pToolBar;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFileTableNavigationWidget.cpp

@@ -115 +115 @@
 UIFileManagerBreadCrumbs::UIFileManagerBreadCrumbs(QWidget *pParent /* = 0 */)
     :QLabel(pParent)
-    , m_pathSeparator('/')
+    , m_pathSeparator(UIPathOperations::delimiter)
 {
     float fFontMult = 1.f;
@@ -139 +139 @@
     m_strPath = strPath;
 
-    const QChar separator('/');
+    const QChar separator(UIPathOperations::delimiter);
     clear();
 
@@ -146 +146 @@
 
     QStringList folderList = UIPathOperations::pathTrail(strPath);
-    folderList.push_front(separator);
+    if (!strPath.isEmpty() && strPath.at(0) == UIPathOperations::delimiter)
+        folderList.push_front(separator);
 
     QString strLabelText;
@@ -154 +155 @@
     for (int i = 0; i < folderList.size(); ++i)
     {
-        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i));
+        QString strFolder = folderList.at(i);
         if (i != 0)
             strPathUpto[i] = strPathUpto[i - 1];
-        if (i == 0 || i == folderList.size() - 1)
-            strPathUpto[i].append(QString("%1").arg(strFolder));
-        else
-            strPathUpto[i].append(QString("%1%2").arg(strFolder).arg(separator));
+        strPathUpto[i].append(QString("%1%2").arg(strFolder).arg(separator));
     }
 
@@ -166 +164 @@
     for (int i = folderList.size() - 1; i >= 0; --i)
     {
-        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i)).replace('/', m_pathSeparator);
+        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i)).replace(UIPathOperations::delimiter, m_pathSeparator);
         QString strWord = QString("<a href=\"%1\" style=\"color:black;text-decoration:none;\">%2</a>").arg(strPathUpto[i]).arg(strFolder);
 
@@ -214 +212 @@
     , m_pAddressLineEdit(0)
     , m_pSwitchButton(0)
-    , m_pathSeparator('/')
+    , m_pathSeparator(UIPathOperations::delimiter)
 {
     prepare();
@@ -232 +230 @@
     {
         QString strNativeLocation(strLocation);
-        strNativeLocation.replace('/', m_pathSeparator);
+        strNativeLocation.replace(UIPathOperations::delimiter, m_pathSeparator);
         int itemIndex = m_pHistoryComboBox->findText(strNativeLocation,
                                                       Qt::MatchExactly | Qt::MatchCaseSensitive);
@@ -369 +367 @@
 void UIFileTableNavigationWidget::sltHandlePathChange(const QString &strPath)
 {
-    emit sigPathChanged(QDir::fromNativeSeparators(strPath));
+    emit sigPathChanged(UIPathOperations::replaceDosDelimeter(strPath));
 }