Changeset 75682 in vbox for trunk

Timestamp:

Nov 23, 2018 9:40:56 AM (6 years ago)

Author:

vboxsync

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

126877

Message:

FE/Qt: bugref:6699 Fix r126854

Location:

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

Files:

• UIGuestFileTable.cpp (modified) (2 diffs)
• UIHostFileTable.cpp (modified) (2 diffs)

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

@@ -437 +437 @@
 
 
-        QString propertyString;
+        QStringList propertyStringList;
 
         /* Name: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " +
-            UIPathOperations::getObjectName(fileInfo.GetName()) + "\n" + "<br/>";
+        propertyStringList << QString("<b>Name:</b> %1<br/>").arg(UIPathOperations::getObjectName(fileInfo.GetName()));
         /* Size: */
         LONG64 size = fileInfo.GetObjectSize();
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(size) +
-            UIGuestControlFileManager::tr(" bytes");
+        propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(size));
         if (size >= 1024)
-            propertyString += " (" + humanReadableSize(size) + ")" + "<br/>";
+            propertyStringList << QString(" (%1)").arg(humanReadableSize(size));
+        else
+            propertyStringList << QString("<br/>");
         /* Type: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo)) + "<br/>";
+        propertyStringList <<  UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
         /* Creation Date: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " +
-            QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString() + "<br/>";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Created:</b> %1<br/>").
+            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString());
         /* Last Modification Date: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " +
-            QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString() + "<br/>";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").
+            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString());
         /* Owner: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.GetUserName();
-        return propertyString;
+        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1<br/>").arg(fileInfo.GetUserName());
+        /* Join the list elements into a single string seperated by empty string: */
+        return propertyStringList.join(QString());
     }
 
@@ -482 +483 @@
         totalSize += fileInfo.GetObjectSize();
     }
-    QString propertyString;
-    propertyString += "<b>" + UIGuestControlFileManager::tr("Selected:") + "</b> " + QString::number(fileCount) + " files ";
-    propertyString += UIGuestControlFileManager::tr("and ") + QString::number(directoryCount) + " " +
-        UIGuestControlFileManager::tr("directories") + "<br/>";
-    propertyString += "<b>" + UIGuestControlFileManager::tr("Size:") + "</b> " + QString::number(totalSize) +
-        UIGuestControlFileManager::tr(" bytes");
+    QStringList propertyStringList;
+    propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
+        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
+    propertyStringList << UIGuestControlFileManager::tr("<b>Size (non-recursive):</b> %1 bytes").arg(QString::number(totalSize));
     if (totalSize >= m_iKiloByte)
-        propertyString += " (" + humanReadableSize(totalSize) + ")";
-
-    return propertyString;
+        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
+
+    return propertyStringList.join(QString());;
 }
 

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

@@ -366 +366 @@
         if (!fileInfo.exists())
             return QString();
-        QString propertyString;
+        QStringList propertyStringList;
         /* Name: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " + fileInfo.fileName() + "\n";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Name:</b> %1").arg(fileInfo.fileName());
         if (!fileInfo.suffix().isEmpty())
-            propertyString += "." + fileInfo.suffix();
-        propertyString += "<br/>";
+            propertyStringList << QString(".%1").arg(fileInfo.suffix());
+        propertyStringList << "<br/>";
         /* Size: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " +
-            QString::number(fileInfo.size()) + UIGuestControlFileManager::tr(" bytes");
+        propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(fileInfo.size()));
         if (fileInfo.size() >= m_iKiloByte)
-            propertyString += " (" + humanReadableSize(fileInfo.size()) + ")";
-        propertyString += "<br/>";
+            propertyStringList << QString(" (%1)").arg(humanReadableSize(fileInfo.size()));
+        propertyStringList << "<br/>";
         /* Type: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo));
-        propertyString += "<br/>";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
         /* Creation Date: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " + fileInfo.created().toString();
-        propertyString += "<br/>";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.created().toString());
         /* Last Modification Date: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " + fileInfo.lastModified().toString();
-        propertyString += "<br/>";
+        propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").arg(fileInfo.lastModified().toString());
         /* Owner: */
-        propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.owner();
-
-        return propertyString;
+        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1").arg(fileInfo.owner());
+
+        return propertyStringList.join(QString());;
     }
 
@@ -408 +404 @@
         totalSize += fileInfo.size();
     }
-    QString propertyString;
-    propertyString += "<b>" + UIGuestControlFileManager::tr("Selected") + ":</b> " + QString::number(fileCount) +
-        " " + UIGuestControlFileManager::tr("files") + " ";
-    propertyString += UIGuestControlFileManager::tr("and") + " " + QString::number(directoryCount) + " " +
-        UIGuestControlFileManager::tr("directories");
-    propertyString += "<br/>";
-    propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(totalSize) + " " +
-        UIGuestControlFileManager::tr("bytes");
+    QStringList propertyStringList;
+    propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
+        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
+    propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(totalSize));
     if (totalSize >= m_iKiloByte)
-        propertyString += " (" + humanReadableSize(totalSize) + ")";
-
-    return propertyString;
+        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
+
+    return propertyStringList.join(QString());
 }