Changeset 75932 in vbox

Timestamp:

Dec 4, 2018 12:02:00 AM (6 years ago)

Author:

vboxsync

Message:

Fe/QT: Some more UIGuestFileTable::fsObjectPropertyString adjustments and fixes.

Location:

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

Files:

• UIGuestControlFileTable.h (modified) (1 diff)
• UIGuestFileTable.cpp (modified) (3 diffs)

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

@@ -52 +52 @@
 class UIToolBar;
 
+/** @todo r=bird: Why don't you just use KFsObjType? */
 enum FileObjectType
 {

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

@@ -423 +423 @@
             return QString();
 
-        CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(selectedObjects.at(0), true);
+        CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(selectedObjects.at(0), false /*aFollowSymlinks*/);
         if (!m_comGuestSession.isOk())
         {
@@ -453 +453 @@
         /* Type: */
         QString str;
-        switch (fileInfo.GetType())
+        KFsObjType const enmType = fileInfo.GetType();
+        switch (enmType)
         {
             case KFsObjType_Directory:  str = tr("directory"); break;
@@ -477 +478 @@
         if (!str.isEmpty())
         {
-            int offSpace = str.indexOf(" ");
+            int offSpace = str.indexOf(' ');
             if (offSpace < 0)
                 offSpace = str.length();
             propertyStringList << UIGuestControlFileManager::tr("<b>Mode:</b> %1<br/>").arg(str.left(offSpace));
-            propertyStringList << UIGuestControlFileManager::tr("<b>Attributes:</b> %1<br/>").arg(str.right(offSpace).trimmed());
+            propertyStringList << UIGuestControlFileManager::tr("<b>Attributes:</b> %1<br/>").arg(str.mid(offSpace + 1).trimmed());
         }
 
         /* Character/block device ID: */
         ULONG uDeviceNo = fileInfo.GetDeviceNumber();
-        if (uDeviceNo != 0)
+        if (uDeviceNo != 0 || enmType == KFsObjType_DevChar || enmType == KFsObjType_DevBlock)
             propertyStringList << UIGuestControlFileManager::tr("<b>Device ID:</b> %1<br/>").arg(uDeviceNo); /** @todo hex */
 
         /* Owner: */
-        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1 (%1)<br/>").
+        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1 (%2)<br/>").
             arg(fileInfo.GetUserName()).arg(fileInfo.GetUID());
-        propertyStringList << UIGuestControlFileManager::tr("<b>Group:</b> %1<br/>").
+        propertyStringList << UIGuestControlFileManager::tr("<b>Group:</b> %1 (%2)<br/>").
             arg(fileInfo.GetGroupName()).arg(fileInfo.GetGID());