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

Timestamp:

Dec 4, 2018 10:49:47 AM (6 years ago)

Author:

vboxsync

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

127150

Message:

FE/Qt: bugref:6699. Make the permission string avaible on the file table column

Location:

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

Files:

• UIGuestFileTable.cpp (modified) (5 diffs)
• UIGuestFileTable.h (modified) (1 diff)

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

@@ -200 +200 @@
         {
             QVector<QVariant> data;
-            QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/1000000);
+            QDateTime changeTime = QDateTime::fromMSecsSinceEpoch(fsInfo.GetChangeTime()/RT_NS_1MS);
 
             data << fsInfo.GetName() << static_cast<qulonglong>(fsInfo.GetObjectSize())
-                 << changeTime << fsInfo.GetUserName();
+                 << changeTime << fsInfo.GetUserName() << permissionString(fsInfo);
+
             FileObjectType fsObjectType = fileType(fsInfo);
             UIFileTableItem *item = new UIFileTableItem(data, parent, fsObjectType);
+
             if (!item)
                 continue;
@@ -219 +221 @@
                 item->setIsOpened(false);
             }
-            /** @todo Seems like our API is not able to detect symlinks: */
             else if(fsObjectType == FileObjectType_SymLink)
             {
                 files.insert(fsInfo.GetName(), item);
                 item->setIsOpened(false);
+                /* @todo. We will need to wait a fully implemented SymlinkRead function
+                 * to be able to handle sym links properly: */
+                // QString path = UIPathOperations::mergePaths(strPath, fsInfo.GetName());
+                // QVector<KSymlinkReadFlag> aFlags;
+                // printf("%s %s %s\n", qPrintable(fsInfo.GetName()), qPrintable(path),
+                //        qPrintable(m_comGuestSession.SymlinkRead(path, aFlags)));
             }
 
@@ -438 +445 @@
         LONG64 size = fileInfo.GetObjectSize();
         propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(size));
-        if (size >= 1024)
+        if (size >= UIGuestControlFileTable::m_iKiloByte)
             propertyStringList << QString(" (%1)<br/>").arg(humanReadableSize(size));
         else
@@ -446 +453 @@
         size = fileInfo.GetAllocatedSize();
         propertyStringList << UIGuestControlFileManager::tr("<b>Allocated:</b> %1 bytes").arg(QString::number(size));
-        if (size >= 1024)
+        if (size >= UIGuestControlFileTable::m_iKiloByte)
             propertyStringList << QString(" (%1)<br/>").arg(humanReadableSize(size));
         else
@@ -731 +738 @@
     return true;
 }
+
+QString UIGuestFileTable::permissionString(const CFsObjInfo &fsInfo)
+{
+    /* Attributes: */
+    QString strAttributes = fsInfo.GetFileAttributes();
+
+    if (strAttributes.isEmpty())
+        return strAttributes;
+
+    int offSpace = strAttributes.indexOf(' ');
+    if (offSpace < 0)
+        offSpace = strAttributes.length();
+    return strAttributes.left(offSpace);
+}
+
 #include "UIGuestFileTable.moc"

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

@@ -78 +78 @@
     void prepareActionConnections();
     bool checkGuestSession();
-
+    QString permissionString(const CFsObjInfo &fsInfo);
     mutable CGuestSession     m_comGuestSession;
 };