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

Timestamp:

Dec 10, 2018 11:37:30 AM (6 years ago)

Author:

vboxsync

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

127347

Message:

FE/Qt: bugref:6699. Change the order we show sym.links to folders

Location:

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

Files:

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

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

@@ -52 +52 @@
         if (pOptions && pOptions->bListDirectoriesOnTop)
         {
-            if (pLeftItem->isDirectory() && !pRightItem->isDirectory())
+            if ((pLeftItem->isDirectory() || pLeftItem->isSymLinkToADirectory()) && !pRightItem->isDirectory())
                 return (sortOrder() == Qt::AscendingOrder);
-            if (!pLeftItem->isDirectory() && pRightItem->isDirectory())
+            if ((pRightItem->isDirectory() || pRightItem->isSymLinkToADirectory()) && !pLeftItem->isDirectory())
                 return (sortOrder() == Qt::DescendingOrder);
         }
@@ -189 +189 @@
         else if (item->isSymLink())
         {
-            if (item->isTargetADirectory())
+            if (item->isSymLinkToADirectory())
                 return QIcon(":/file_manager_folder_symlink_16px.png");
             else

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

@@ -606 +606 @@
 }
 
-bool UIFileTableItem::isTargetADirectory() const
+bool UIFileTableItem::isSymLinkToADirectory() const
 {
     return m_isTargetADirectory;
 }
 
-void UIFileTableItem::setIsTargetADirectory(bool flag)
+void UIFileTableItem::setIsSymLinkToADirectory(bool flag)
 {
     m_isTargetADirectory = flag;
+}
+
+bool UIFileTableItem::isSymLinkToAFile() const
+{
+    return isSymLink() && !m_isTargetADirectory;
 }
 
@@ -993 +998 @@
     }
 
-    if (item->isDirectory() || (item->isSymLink() && item->isTargetADirectory()))
+    if (item->isDirectory() || item->isSymLinkToADirectory())
     {
         if (!item->isOpened())

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

@@ -204 +204 @@
     void setTargetPath(const QString &path);
 
-    bool isTargetADirectory() const;
-    void setIsTargetADirectory(bool flag);
+    bool isSymLinkToADirectory() const;
+    void setIsSymLinkToADirectory(bool flag);
+
+    bool isSymLinkToAFile() const;
 
     const QString &owner() const;

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

@@ -231 +231 @@
         {
             item->setTargetPath(fileInfo.symLinkTarget());
-            item->setIsTargetADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
+            item->setIsSymLinkToADirectory(QFileInfo(fileInfo.symLinkTarget()).isDir());
         }
         if (fileInfo.isDir())