VirtualBox

Changeset 75682 in vbox for trunk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestFileTable.cpp

    r75662 r75682  
    437437
    438438
    439         QString propertyString;
     439        QStringList propertyStringList;
    440440
    441441        /* Name: */
    442         propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " +
    443             UIPathOperations::getObjectName(fileInfo.GetName()) + "\n" + "<br/>";
     442        propertyStringList << QString("<b>Name:</b> %1<br/>").arg(UIPathOperations::getObjectName(fileInfo.GetName()));
    444443        /* Size: */
    445444        LONG64 size = fileInfo.GetObjectSize();
    446         propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(size) +
    447             UIGuestControlFileManager::tr(" bytes");
     445        propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(size));
    448446        if (size >= 1024)
    449             propertyString += " (" + humanReadableSize(size) + ")" + "<br/>";
     447            propertyStringList << QString(" (%1)").arg(humanReadableSize(size));
     448        else
     449            propertyStringList << QString("<br/>");
    450450        /* Type: */
    451         propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo)) + "<br/>";
     451        propertyStringList <<  UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
    452452        /* Creation Date: */
    453         propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " +
    454             QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString() + "<br/>";
     453        propertyStringList << UIGuestControlFileManager::tr("<b>Created:</b> %1<br/>").
     454            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetChangeTime()/1000000).toString());
    455455        /* Last Modification Date: */
    456         propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " +
    457             QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString() + "<br/>";
     456        propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").
     457            arg(QDateTime::fromMSecsSinceEpoch(fileInfo.GetModificationTime()/1000000).toString());
    458458        /* Owner: */
    459         propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.GetUserName();
    460         return propertyString;
     459        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1<br/>").arg(fileInfo.GetUserName());
     460        /* Join the list elements into a single string seperated by empty string: */
     461        return propertyStringList.join(QString());
    461462    }
    462463
     
    482483        totalSize += fileInfo.GetObjectSize();
    483484    }
    484     QString propertyString;
    485     propertyString += "<b>" + UIGuestControlFileManager::tr("Selected:") + "</b> " + QString::number(fileCount) + " files ";
    486     propertyString += UIGuestControlFileManager::tr("and ") + QString::number(directoryCount) + " " +
    487         UIGuestControlFileManager::tr("directories") + "<br/>";
    488     propertyString += "<b>" + UIGuestControlFileManager::tr("Size:") + "</b> " + QString::number(totalSize) +
    489         UIGuestControlFileManager::tr(" bytes");
     485    QStringList propertyStringList;
     486    propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
     487        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
     488    propertyStringList << UIGuestControlFileManager::tr("<b>Size (non-recursive):</b> %1 bytes").arg(QString::number(totalSize));
    490489    if (totalSize >= m_iKiloByte)
    491         propertyString += " (" + humanReadableSize(totalSize) + ")";
    492 
    493     return propertyString;
     490        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
     491
     492    return propertyStringList.join(QString());;
    494493}
    495494
  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIHostFileTable.cpp

    r75662 r75682  
    366366        if (!fileInfo.exists())
    367367            return QString();
    368         QString propertyString;
     368        QStringList propertyStringList;
    369369        /* Name: */
    370         propertyString += "<b>" + UIGuestControlFileManager::tr("Name") + ":</b> " + fileInfo.fileName() + "\n";
     370        propertyStringList << UIGuestControlFileManager::tr("<b>Name:</b> %1").arg(fileInfo.fileName());
    371371        if (!fileInfo.suffix().isEmpty())
    372             propertyString += "." + fileInfo.suffix();
    373         propertyString += "<br/>";
     372            propertyStringList << QString(".%1").arg(fileInfo.suffix());
     373        propertyStringList << "<br/>";
    374374        /* Size: */
    375         propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " +
    376             QString::number(fileInfo.size()) + UIGuestControlFileManager::tr(" bytes");
     375        propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(fileInfo.size()));
    377376        if (fileInfo.size() >= m_iKiloByte)
    378             propertyString += " (" + humanReadableSize(fileInfo.size()) + ")";
    379         propertyString += "<br/>";
     377            propertyStringList << QString(" (%1)").arg(humanReadableSize(fileInfo.size()));
     378        propertyStringList << "<br/>";
    380379        /* Type: */
    381         propertyString += "<b>" + UIGuestControlFileManager::tr("Type") + ":</b> " + fileTypeString(fileType(fileInfo));
    382         propertyString += "<br/>";
     380        propertyStringList << UIGuestControlFileManager::tr("<b>Type:</b> %1<br/>").arg(fileTypeString(fileType(fileInfo)));
    383381        /* Creation Date: */
    384         propertyString += "<b>" + UIGuestControlFileManager::tr("Created") + ":</b> " + fileInfo.created().toString();
    385         propertyString += "<br/>";
     382        propertyStringList << UIGuestControlFileManager::tr("<b>Created:</b> %1<br/>").arg(fileInfo.created().toString());
    386383        /* Last Modification Date: */
    387         propertyString += "<b>" + UIGuestControlFileManager::tr("Modified") + ":</b> " + fileInfo.lastModified().toString();
    388         propertyString += "<br/>";
     384        propertyStringList << UIGuestControlFileManager::tr("<b>Modified:</b> %1<br/>").arg(fileInfo.lastModified().toString());
    389385        /* Owner: */
    390         propertyString += "<b>" + UIGuestControlFileManager::tr("Owner") + ":</b> " + fileInfo.owner();
    391 
    392         return propertyString;
     386        propertyStringList << UIGuestControlFileManager::tr("<b>Owner:</b> %1").arg(fileInfo.owner());
     387
     388        return propertyStringList.join(QString());;
    393389    }
    394390
     
    408404        totalSize += fileInfo.size();
    409405    }
    410     QString propertyString;
    411     propertyString += "<b>" + UIGuestControlFileManager::tr("Selected") + ":</b> " + QString::number(fileCount) +
    412         " " + UIGuestControlFileManager::tr("files") + " ";
    413     propertyString += UIGuestControlFileManager::tr("and") + " " + QString::number(directoryCount) + " " +
    414         UIGuestControlFileManager::tr("directories");
    415     propertyString += "<br/>";
    416     propertyString += "<b>" + UIGuestControlFileManager::tr("Size") + ":</b> " + QString::number(totalSize) + " " +
    417         UIGuestControlFileManager::tr("bytes");
     406    QStringList propertyStringList;
     407    propertyStringList << UIGuestControlFileManager::tr("<b>Selected:</b> %1 files and %2 directories<br/>").
     408        arg(QString::number(fileCount)).arg(QString::number(directoryCount));
     409    propertyStringList << UIGuestControlFileManager::tr("<b>Size:</b> %1 bytes").arg(QString::number(totalSize));
    418410    if (totalSize >= m_iKiloByte)
    419         propertyString += " (" + humanReadableSize(totalSize) + ")";
    420 
    421     return propertyString;
     411        propertyStringList << QString(" (%1)").arg(humanReadableSize(totalSize));
     412
     413    return propertyStringList.join(QString());
    422414}
    423415
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette