Aftermath for PR-1956 and PR-2025 (#2035)

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
main
Benjamin Jillich 5 years ago committed by GitHub
parent b4cee8c3c5
commit c9ff634080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -10,7 +10,6 @@
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QSpacerItem> #include <QSpacerItem>
#include <QWidget>
namespace O3DE::ProjectManager namespace O3DE::ProjectManager
{ {
@ -72,10 +71,9 @@ namespace O3DE::ProjectManager
hLayout->setMargin(0); hLayout->setMargin(0);
hLayout->setSpacing(8); hLayout->setSpacing(8);
const int numTags = tags.count(); for(const QString& tag : tags)
for (int i = 0; i < numTags; ++i)
{ {
FilterTagWidget* tagWidget = new FilterTagWidget(tags[i]); FilterTagWidget* tagWidget = new FilterTagWidget(tag);
// Add the tag widget to the current row. // Add the tag widget to the current row.
hLayout->addWidget(tagWidget); hLayout->addWidget(tagWidget);

@ -250,7 +250,7 @@ namespace O3DE::ProjectManager
progressDialog->setValue(0); progressDialog->setValue(0);
progressDialog->setRange(0, 1000); progressDialog->setRange(0, 1000);
progressDialog->setModal(true); progressDialog->setModal(true);
progressDialog->setWindowTitle("Copying project ..."); progressDialog->setWindowTitle(QObject::tr("Copying project ..."));
progressDialog->show(); progressDialog->show();
QLocale locale; QLocale locale;
@ -259,7 +259,12 @@ namespace O3DE::ProjectManager
// Create a human-readable version of the file size. // Create a human-readable version of the file size.
const QString fileSizeString = locale.formattedDataSize(sizeInBytes); const QString fileSizeString = locale.formattedDataSize(sizeInBytes);
progressDialog->setLabelText(QString("Indexing files ... %1 files found, %2 to copy.").arg(fileCount).arg(fileSizeString)); progressDialog->setLabelText(QString("%1 ... %2 %3, %4 %5.")
.arg(QObject::tr("Indexing files"))
.arg(QString::number(fileCount))
.arg(QObject::tr("files found"))
.arg(fileSizeString)
.arg(QObject::tr("to copy")));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
}); });
@ -277,7 +282,7 @@ namespace O3DE::ProjectManager
if (!success) if (!success)
{ {
progressDialog->setLabelText("Duplicating project failed/cancelled, removing already copied files ..."); progressDialog->setLabelText(QObject::tr("Duplicating project failed/cancelled, removing already copied files ..."));
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
DeleteProjectFiles(newPath, true); DeleteProjectFiles(newPath, true);

Loading…
Cancel
Save