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

Timestamp:

Apr 16, 2019 3:52:58 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Showing correct path separators in file manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPathOperations.cpp (modified) (1 diff)
• guestctrl/UIFileManagerGuestTable.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerGuestTable.h (modified) (1 diff)
• guestctrl/UIFileManagerHostTable.cpp (modified) (2 diffs)
• guestctrl/UIFileManagerHostTable.h (modified) (1 diff)
• guestctrl/UIFileManagerTable.cpp (modified) (16 diffs)
• guestctrl/UIFileManagerTable.h (modified) (5 diffs)

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

@@ -130 +130 @@
 /* static */ QStringList UIPathOperations::pathTrail(const QString &path)
 {
-    QStringList pathList = path.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
-    if (!pathList.isEmpty() && doesPathStartWithDriveLetter(pathList[0]))
-    {
-        pathList[0] = addTrailingDelimiters(pathList[0]);
-    }
-    return pathList;
+    return path.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
 }
 

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

@@ -158 +158 @@
         return;
     m_comGuestSession = session;
+    /* To determine the path separator we need to have a valid guest session: */
+    determinePathSeparator();
     initializeFileTree();
 }
@@ -604 +606 @@
             m_driveLetterList.push_back(path);
     }
+}
+
+void UIFileManagerGuestTable::determinePathSeparator()
+{
+    if (m_comGuestSession.isNull())
+        return;
+    KPathStyle pathStyle = m_comGuestSession.GetPathStyle();
+    if (pathStyle == KPathStyle_DOS)
+        setPathSeparator(UIPathOperations::dosDelimiter);
 }
 

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

@@ -66 +66 @@
     virtual void    showProperties() /* override */;
     virtual void    determineDriveLetters() /* override */;
+    virtual void    determinePathSeparator() /* override */;
     virtual void    prepareToolbar() /* override */;
     virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;

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

@@ -127 +127 @@
     prepareToolbar();
     prepareActionConnections();
+    determinePathSeparator();
     retranslateUi();
 }
@@ -448 +449 @@
         if (UIPathOperations::doesPathStartWithDriveLetter(drive[i].filePath()))
             m_driveLetterList.push_back(drive[i].filePath());
-
-    }
+    }
+}
+
+void UIFileManagerHostTable::determinePathSeparator()
+{
+    setPathSeparator(QDir::separator());
 }
 

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

@@ -56 +56 @@
     virtual void    showProperties() /* override */;
     virtual void    determineDriveLetters() /* override */;
+    virtual void    determinePathSeparator() /* override */;
     virtual void    prepareToolbar() /* override */;
     virtual void    createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) /* override */;

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

@@ -84 +84 @@
     UIFileManagerBreadCrumbs(QWidget *pParent = 0);
     void setPath(const QString &strPath);
+    void setPathSeparator(const QChar &separator);
 
 protected:
@@ -92 +93 @@
 
     QString m_strPath;
+    QChar   m_pathSeparator;
 };
 
@@ -113 +115 @@
     void setPath(const QString &strLocation);
     void reset();
+    void setPathSeparator(const QChar &separator);
 
 private slots:
@@ -119 +122 @@
     /* Makes sure that we switch to breadcrumbs widget as soon as the combo box popup is hidden. */
     void sltHandleHidePopup();
+    void sltHandlePathChange(const QString &strPath);
 
 private:
@@ -128 +132 @@
     UIFileManagerHistoryComboBox *m_pHistoryComboBox;
     QToolButton                  *m_pSwitchButton;
+    QChar                         m_pathSeparator;
 };
 
@@ -250 +255 @@
     , m_pHistoryComboBox(0)
     , m_pSwitchButton(0)
+    , m_pathSeparator('/')
 {
     prepare();
@@ -261 +267 @@
     if (m_pHistoryComboBox)
     {
-        int itemIndex = m_pHistoryComboBox->findText(strLocation,
+        QString strNativeLocation(strLocation);
+        strNativeLocation.replace('/', m_pathSeparator);
+        int itemIndex = m_pHistoryComboBox->findText(strNativeLocation,
                                                       Qt::MatchExactly | Qt::MatchCaseSensitive);
         if (itemIndex == -1)
         {
-            m_pHistoryComboBox->insertItem(m_pHistoryComboBox->count(), strLocation);
+            m_pHistoryComboBox->insertItem(m_pHistoryComboBox->count(), strNativeLocation);
             itemIndex = m_pHistoryComboBox->count() - 1;
         }
@@ -277 +285 @@
     {
         disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                   this, &UIFileManagerNavigationWidget::sigPathChanged);
+                   this, &UIFileManagerNavigationWidget::sltHandlePathChange);
         m_pHistoryComboBox->clear();
         connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                this, &UIFileManagerNavigationWidget::sigPathChanged);
+                this, &UIFileManagerNavigationWidget::sltHandlePathChange);
     }
 
     if (m_pBreadCrumbs)
         m_pBreadCrumbs->setPath(QString());
+}
+
+void UIFileManagerNavigationWidget::setPathSeparator(const QChar &separator)
+{
+    m_pathSeparator = separator;
+    if (m_pBreadCrumbs)
+        m_pBreadCrumbs->setPathSeparator(m_pathSeparator);
 }
 
@@ -305 +320 @@
             m_pBreadCrumbs->setIndent(0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin));
             connect(m_pBreadCrumbs, &UIFileManagerBreadCrumbs::linkActivated,
-                    this, &UIFileManagerNavigationWidget::sigPathChanged);
+                    this, &UIFileManagerNavigationWidget::sltHandlePathChange);
             connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::sigHidePopup,
                     this, &UIFileManagerNavigationWidget::sltHandleHidePopup);
             connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
-                    this, &UIFileManagerNavigationWidget::sigPathChanged);
+                    this, &UIFileManagerNavigationWidget::sltHandlePathChange);
 
             m_pContainer->addWidget(m_pBreadCrumbs);
@@ -340 +355 @@
 }
 
+void UIFileManagerNavigationWidget::sltHandlePathChange(const QString &strPath)
+{
+    QString strNonNativePath(strPath);
+    strNonNativePath.replace(m_pathSeparator, '/');
+    emit sigPathChanged(strNonNativePath);
+}
+
 void UIFileManagerNavigationWidget::sltHandleSwitch()
 {
@@ -361 +383 @@
 UIFileManagerBreadCrumbs::UIFileManagerBreadCrumbs(QWidget *pParent /* = 0 */)
     :QLabel(pParent)
+    , m_pathSeparator('/')
 {
     float fFontMult = 1.2f;
@@ -407 +430 @@
     for (int i = folderList.size() - 1; i >= 0; --i)
     {
-        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i));
+        QString strFolder = UIPathOperations::removeTrailingDelimiters(folderList.at(i)).replace('/', m_pathSeparator);
         QString strWord = QString("<a href=\"%1\" style=\"color:black;text-decoration:none;\">%2</a>").arg(strPathUpto[i]).arg(strFolder);
-
         if (i < folderList.size() - 1)
         {
@@ -422 +444 @@
     }
     setText(strLabelText);
+}
+
+void UIFileManagerBreadCrumbs::setPathSeparator(const QChar &separator)
+{
+    m_pathSeparator = separator;
 }
 
@@ -669 +696 @@
     , m_pView(0)
     , m_pProxyModel(0)
+    , m_pNavigationWidget(0)
     , m_pMainLayout(0)
     , m_pWarningLabel(0)
-    , m_pNavigationWidget(0)
+    , m_pathSeparator('/')
 {
     prepareObjects();
@@ -849 +877 @@
         for (int i = 0; i < m_driveLetterList.size(); ++i)
         {
-            UICustomFileSystemItem* driveItem = new UICustomFileSystemItem(m_driveLetterList[i], startItem, KFsObjType_Directory);
+            UICustomFileSystemItem* driveItem = new UICustomFileSystemItem(UIPathOperations::removeTrailingDelimiters(m_driveLetterList[i]),
+                                                                           startItem, KFsObjType_Directory);
             driveItem->setPath(m_driveLetterList[i]);
             driveItem->setIsOpened(false);
@@ -1402 +1431 @@
 }
 
+void UIFileManagerTable::setPathSeparator(const QChar &separator)
+{
+    m_pathSeparator = separator;
+    if (m_pNavigationWidget)
+        m_pNavigationWidget->setPathSeparator(m_pathSeparator);
+}
+
 bool UIFileManagerTable::event(QEvent *pEvent)
 {

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

@@ -209 +209 @@
      *  drive letters */
     virtual void     determineDriveLetters() = 0;
+    virtual void     determinePathSeparator() = 0;
     virtual void     prepareToolbar() = 0;
     virtual void     createFileViewContextMenu(const QWidget *pWidget, const QPoint &point) = 0;
@@ -234 +235 @@
     void             setSelectionDependentActionsEnabled(bool fIsEnabled);
     UICustomFileSystemItem*   rootItem();
+    void             setPathSeparator(const QChar &separator);
 
     QILabel                 *m_pLocationLabel;
@@ -239 +241 @@
     UIActionPool            *m_pActionPool;
     UIToolBar               *m_pToolBar;
+
     /** Stores the drive letters the file system has (for windows system). For non-windows
      *  systems this is empty and for windows system it should at least contain C:/ */
@@ -287 +290 @@
     void            markUnmarkSearchLineEdit(bool fMark);
 
-    UICustomFileSystemModel      *m_pModel;
-    UIGuestControlFileView       *m_pView;
-    UICustomFileSystemProxyModel *m_pProxyModel;
+    UICustomFileSystemModel       *m_pModel;
+    UIGuestControlFileView        *m_pView;
+    UICustomFileSystemProxyModel  *m_pProxyModel;
+    /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
+    UIFileManagerNavigationWidget *m_pNavigationWidget;
 
     QGridLayout     *m_pMainLayout;
@@ -296 +301 @@
     QColor           m_searchLineMarkColor;
     QILabel         *m_pWarningLabel;
-
-    /** Contains m_pBreadCrumbsWidget and m_pLocationComboBox. */
-    UIFileManagerNavigationWidget           *m_pNavigationWidget;
-    //UIFileManagerBreadCrumbs *m_pBreadCrumbsWidget;
+    QChar            m_pathSeparator;
 
     friend class     UICustomFileSystemModel;