Changeset 71861 in vbox for trunk

Timestamp:

Apr 13, 2018 2:11:11 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:66099 Add 'permissions' column to the file manager

Location:

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

Files:

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

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

@@ -1012 +1012 @@
     const QString startPath("/");
     QList<QVariant> headData;
-    headData << "Name" << "Size" << "Change Time" << "Owner";
+    headData << "Name" << "Size" << "Change Time" << "Owner" << "Permissions";
     m_pRootItem = new UIFileTableItem(headData, 0, FileObjectType_Directory);
     QList<QVariant> startDirData;
-    startDirData << startPath << 4096 << QDateTime() << "";
+    startDirData << startPath << 4096 << QDateTime() << "" << "";
     UIFileTableItem* startItem = new UIFileTableItem(startDirData, m_pRootItem, FileObjectType_Directory);
 

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

@@ -340 +340 @@
     {
         QVector<KDirectoryCopyFlag> aFlags(KDirectoryCopyFlag_CopyIntoExisting);
+        QString destinatioFilePath =  UIPathOperations::addTrailingDelimiters(hostDestinationPath);
+        QString sourceWithDelimiter =  UIPathOperations::addTrailingDelimiters(guestSourcePath);
+
         /** @todo listen to CProgress object to monitor copy operation: */
-        /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyFromGuest(guestSourcePath, hostDestinationPath, aFlags);
+        /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyFromGuest(guestSourcePath, hostDestinationPath/*destinatioFilePath*/ , aFlags);
+        m_comGuestSession.DirectoryCopyFromGuest(guestSourcePath, destinatioFilePath , aFlags);
+        m_comGuestSession.DirectoryCopyFromGuest(sourceWithDelimiter, destinatioFilePath , aFlags);
+        m_comGuestSession.DirectoryCopyFromGuest(sourceWithDelimiter, hostDestinationPath , aFlags);
+
     }
     if (!m_comGuestSession.isOk())
@@ -375 +382 @@
         /** @todo listen to CProgress object to monitor copy operation: */
         comProgress = m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, destinationFilePath, aFlags);
-
-
     }
     /** @todo currently I cannot get an errorfrom CProgress: */
@@ -392 +397 @@
         return false;
     }
-
+    /** @todo we have to until CProgress finishes to refresh: */
+    refresh();
     return true;
 }

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

@@ -58 +58 @@
     bool copyGuestToHost(const QString &guestSourcePath, const QString& hostDestinationPath);
     bool copyHostToGuest(const QString& hostSourcePath, const QString &guestDestinationPath);
-
     mutable CGuestSession m_comGuestSession;
 

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

@@ -165 +165 @@
     {
         const QFileInfo &fileInfo = entries.at(i);
-
         QList<QVariant> data;
         data << fileInfo.fileName() << fileInfo.size()
-             << fileInfo.lastModified() << fileInfo.owner();
+             << fileInfo.lastModified() << fileInfo.owner() <<
+            permissionString(fileInfo.permissions());
         UIFileTableItem *item = new UIFileTableItem(data, parent, fileType(fileInfo));
         if (!item)
@@ -389 +389 @@
     for (int i = 0; i < drive.size(); ++i)
     {
-        m_driveLetterList.push_back(drive[i].filePath());
+        if (UIPathOperations::doesPathStartWithDriveLetter(drive[i].filePath()))
+            m_driveLetterList.push_back(drive[i].filePath());
 
     }
@@ -395 +396 @@
 }
 
+QString UIHostFileTable::permissionString(QFileDevice::Permissions permissions)
+{
+    QString strPermissions;
+    if (permissions & QFileDevice::ReadOwner)
+        strPermissions += 'r';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::WriteOwner)
+        strPermissions += 'w';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::ExeOwner)
+        strPermissions += 'x';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::ReadGroup)
+        strPermissions += 'r';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::WriteGroup)
+        strPermissions += 'w';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::ExeGroup)
+        strPermissions += 'x';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::ReadOther)
+        strPermissions += 'r';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::WriteOther)
+        strPermissions += 'w';
+    else
+        strPermissions += '-';
+
+    if (permissions & QFileDevice::ExeOther)
+        strPermissions += 'x';
+    else
+        strPermissions += '-';
+
+
+
+
+
+    return strPermissions;
+}
+
 #include "UIHostFileTable.moc"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.h

@@ -48 +48 @@
 
     void prepareActions();
+    QString permissionString(QFileDevice::Permissions permissions);
 };